diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
deleted file mode 100644
index 4902c97..0000000
--- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-	<view class="wf-item-page">
-		<image :src="item.story_file[0]" class="item-img" />
-		<view class="item-desc">
-			{{item.story_title || ''}}
-		</view>
-		<view class="item-info">
-			<image :src="item.user_avatar" mode="aspectFill" class="info-avatar" />
-			<view class="info-nickname">{{item.user_nickname}}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:{
-			item:{
-				type:Object,
-				require:true
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.wf-item-page{
-		background: #fff;
-		overflow: hidden;
-		border-radius: 5px;
-		position: relative;
-	}
-	
-	.item-img{
-		width: 100%;
-	}
-	
-	.item-info{
-		display: flex;
-		align-items: center;
-		padding: 5px;
-	}
-	
-	.info-avatar{
-		width: 25px;
-		height: 25px;
-		border-radius: 50%;
-		margin-right: 5px;
-	}
-	
-	.info-nickname{
-		font-size: 12px;
-		color: #333;
-	}
-	
-	.item-desc{
-		display: flex;
-		align-items: center;
-		padding: 5px 5px 0px 5px;
-		font-size: 12px;
-	}
-</style>
diff --git a/components/item-list.vue b/components/item-list.vue
deleted file mode 100644
index 4dc59f0..0000000
--- a/components/item-list.vue
+++ /dev/null
@@ -1,1486 +0,0 @@
-<template>
-  <view :class="[isFilterFixed ? 'u-pa' : '']">
-    <view
-      :class="['m-tab', isFilterFixed ? 'm-tab-fixed' : 'm-tab-top']"
-      :style="'top:' + fixTop + 'px'"
-      v-if="isShowFilter && tabs.length > 0"
-    >
-      <scroll-view
-        class="m-navbar scroll-view_H"
-        scroll-x
-        style="width: 94%"
-        :show-scrollbar="true"
-      >
-        <view class="m-navbar-info">
-          <block v-for="(tab, index) in tabs" :key="index">
-            <view
-              class="m-navbar-item"
-              :class="index == key ? 'item-on' : ''"
-              @click="switchTabs(index)"
-            >
-              {{ tab.name }}
-
-              <label
-                class="iconfont zc zc-youxiajiao active-icon"
-                v-if="index == key"
-              ></label>
-            </view>
-          </block>
-        </view>
-      </scroll-view>
-
-      <scroll-view
-        scroll-top="200"
-        class="m-navbar scroll-view_H"
-        scroll-x
-        :style="'width:' + (tabs[key].sidx && tabs[key].sort ? '80%' : '94%')"
-        :show-scrollbar="true"
-        v-if="tabs[key].isShowFilter"
-      >
-        <block v-for="(price, index) in prices" :key="index">
-          <view
-            class="filter-item"
-            :class="priceIndex == index ? 'filter-item-on' : ''"
-            @click="selectPriceIndex(index)"
-          >
-            {{ price.title }}
-          </view>
-        </block>
-      </scroll-view>
-    </view>
-    <view
-      scroll-y="true"
-      :class="[
-        'm-product-all  u-pa',
-        isShowFilter && isFilterFixed ? 'm-product-box' : '',
-      ]"
-      :style="{ backgroundColor: bgColor }"
-    >
-      <view
-        :class="{ 'm-product-list': 1, 'm-listv': viewtype == 1 }"
-        v-if="isdata"
-        style="width: 100%"
-      >
-        <block v-for="(item, i) in pdlist" :key="i">
-          <block
-            v-if="
-              priceIndex == -1 ||
-              (post.product_unit_price_max > 0
-                ? item.ItemSalePrice >= post.product_unit_price_min &&
-                  item.ItemSalePrice <= post.product_unit_price_max
-                : item.ItemSalePrice >= post.product_unit_price_min)
-            "
-          >
-            <navigator
-              v-if="!isFG"
-              :url="
-                (item.is_virtual
-                  ? '/pages/product/detail'
-                  : '/pages/product/detail') +
-                '?pid=' +
-                item.id
-              "
-              class="m-product-item"
-              :style="{
-                marginLeft: (i % 2 == 0 ? 10 - paddingLeft : 5) * 2 + 'rpx',
-              }"
-            >
-              <view class="m-product-img product-list">
-                <view
-                  class="m-img-number"
-                  :class="'m-img-' + (i > 3 ? 3 : i)"
-                  v-if="isShowNumber"
-                >
-                  <span>{{ i + 1 }}</span>
-                </view>
-                <image
-                  lazy-load
-                  :src="$.img(item.product_image, 360, 360)"
-                  v-if="item.product_image"
-                />
-              </view>
-              <view
-                class="m-product-info1"
-                style="
-                  display: flex;
-                  flex-flow: column;
-                  justify-content: space-between;
-                "
-              >
-                <view class="m-product-name2">
-                  <label>
-                    <text
-                      class="tag tag-bargain"
-                      v-if="
-                        item.activity_type_id == StateCode.ACTIVITY_TYPE_BARGAIN
-                      "
-                    >
-                      {{ item.activity_type_name }}
-                    </text>
-                    <text
-                      class="tag tag-gift"
-                      v-if="
-                        item.activity_type_id == StateCode.ACTIVITY_TYPE_GIFT
-                      "
-                    >
-                      {{ item.activity_type_name }}
-                    </text>
-                    <text
-                      class="tag tag-saleoff"
-                      v-if="
-                        item.activity_type_id ==
-                        StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT
-                      "
-                    >
-                      {{ item.activity_type_name }}
-                    </text>
-                    <text
-                      class="tag tag-reduction"
-                      v-if="
-                        item.activity_type_id ==
-                        StateCode.ACTIVITY_TYPE_REDUCTION
-                      "
-                    >
-                      {{ item.activity_type_name }}
-                    </text>
-                    {{ item.SalesName }}</label
-                  >
-                </view>
-
-                <view class="m-product-price1">
-                  <view class="money">
-                    <block v-if="item.ItemSalePrice">
-                      <label>{{ __("￥") }}</label
-                      >{{ number_format(item.ItemSalePrice, 2) }}
-                    </block>
-                  </view>
-                  <view
-                    class="num"
-                    v-if="
-                      false &&
-                      plantformInfo.config.product_salenum_flag &&
-                      item.SaleNum > 0
-                    "
-                  >
-                    <text>{{ __("已售") }}</text>
-                    <label style="color: #db384c; margin-left: 2px">{{
-                      item.SaleNum
-                    }}</label>
-                  </view>
-                  <view class="add-cart hide">
-                    <uni-icons
-                      type="plusempty"
-                      size="20"
-                      color="#fff"
-                    ></uni-icons>
-                  </view>
-                  <view :class="'c' + 1" v-if="false"> </view>
-                </view>
-              </view>
-            </navigator>
-          </block>
-        </block>
-      </view>
-      <navigator
-        url="/pagesub/search/search"
-        redirect="true"
-        class="m-nullpage"
-        v-else
-      >
-        <view class="m-nullpage-middle">
-          <label class="iconfont icon-sousuo-sousuo"></label>
-          <view class="m-null-tip">
-            <text>{{ __("亲~找不到您想要的商品") }}</text>
-            <text>{{ __("再多点提示呗") }}</text>
-          </view>
-        </view>
-      </navigator>
-
-      <view class="m-loading-box" v-if="isShowLoading">
-        <block v-if="ispage">
-          <view class="u-loadmore">
-            <label class="u-loading"></label>
-            <text class="u-loadmore-tips">{{ __("正在加载") }}</text>
-          </view>
-        </block>
-        <block v-else>
-          <view class="u-loadmore u-loadmore-line">
-            <text class="u-loadmore-tips">{{ __("没有更多数据啦！") }}</text>
-          </view>
-        </block>
-      </view>
-    </view>
-  </view>
-</template>
-
-
-<script>
-import uniDrawer from "@/components/uni-drawer.vue";
-import uniTag from "@/components/uni-tag/uni-tag.vue";
-import { mapMutations, mapState } from "vuex";
-
-export default {
-  props: {
-    options: {
-      type: Object,
-      default() {
-        return {};
-      },
-    },
-    optionStr: {
-      type: String,
-      default: "{}",
-    },
-    css: {
-      type: Object,
-      default() {
-        return {};
-      },
-    },
-    isShowFilter: {
-      type: [Boolean, Number],
-      default: false,
-    },
-
-    isFilterFixed: {
-      type: Boolean,
-      default: false,
-    },
-
-    fixTop: {
-      type: Number,
-      default() {
-        return 0;
-      },
-    },
-
-    viewtype: {
-      type: Number,
-      default: 1,
-    },
-
-    titleText: {
-      type: String,
-      default: "",
-    },
-
-    titleColor: {
-      type: String,
-      default: "#bfbfbf",
-    },
-
-    bgColor: {
-      type: String,
-      default: "#f8f8f8",
-    },
-
-    paddingLeft: {
-      type: Number,
-      default: 0,
-    },
-
-    paddingRight: {
-      type: Number,
-      default: 0,
-    },
-
-    maxNumber: {
-      type: Number,
-      default: 100,
-    },
-
-    isShowLoading: {
-      type: [Boolean, Number],
-      default: true,
-    },
-    isGuessFlag: {
-      type: Boolean,
-      default: false,
-    },
-    priceList: {
-      type: String,
-      default: "",
-    },
-    uniId: {
-      type: String,
-      default() {
-        return "guessyoulike";
-      },
-    },
-  },
-  data() {
-    return {
-      isStoreFlag: 0,
-      h: 0,
-      /* viewtype: 1, */
-      assist: [],
-      pdlist: [],
-      fglist: [],
-      sort: 2,
-      flag: true,
-      ispage: true,
-      scposition: "",
-      old: {
-        scposition: 0,
-      },
-      istop: false,
-      isdata: false,
-      isVirtual: false,
-      isFG: false,
-      is_filter: false,
-
-      prices: [],
-      priceIndex: -1,
-      sidxName: "排序",
-
-      key: 0,
-      post: {
-        sidx: "product_order",
-        sort: "ASC",
-        isnew: false,
-        keywords: "",
-        store_category_ids: 0,
-        page: 1,
-        store_id: null,
-
-        pa_id: null,
-        pa_type_id: null,
-
-        product_unit_price_min: null,
-        product_unit_price_max: null,
-
-        points_from: null,
-        points_to: null,
-
-        virtual: null,
-        store_type: 1,
-        product_ids: "",
-      },
-
-      tabs: [],
-
-      rightDrawerVisible: false,
-
-      inverted: {
-        gift: true,
-        groupbuy: true,
-        xianshi: true,
-        virtual: true,
-      },
-      contract_row: [],
-      market_row: [],
-      isShowNumber: false,
-    };
-  },
-
-  components: {
-    uniDrawer,
-    uniTag,
-  },
-  computed: mapState([
-    "Config",
-    "StateCode",
-    "notice",
-    "plantformInfo",
-    "shopInfo",
-    "userInfo",
-    "hasLogin",
-  ]),
-  created() {
-    var that = this;
-
-    var h = that.$.getSystemInfoSync().windowHeight;
-
-    that.setData({
-      h: h,
-    });
-
-    var post = this.post;
-    var options = this.options;
-
-    let tmp_opt = this.optionStr;
-
-    options = Object.assign(options, tmp_opt);
-
-    this.setData({
-      post: {
-        store_id: options.store_id,
-        sidx: options.sidx ? options.sidx : "product_order",
-        sort: options.sort ? options.sort : "ASC",
-        keywords: options.keywords,
-        store_category_ids: options.store_category_id,
-        category_id: options.category_id,
-        brand_id: options.brand_id,
-        product_tags: options.tag_id ? [options.tag_id] : [],
-        kind_id: options.kind_id,
-        store_type: options.store_type,
-        page: 1,
-
-        product_unit_price_min: options.product_unit_price_min
-          ? options.product_unit_price_min
-          : "",
-        product_unit_price_max: options.product_unit_price_max
-          ? options.product_unit_price_max
-          : "",
-
-        sp_from: options.sp_from ? options.sp_from : "",
-        sp_to: options.sp_to ? options.sp_to : "",
-
-        points_from: options.points_from ? options.points_from : "",
-        points_to: options.points_to ? options.points_to : "",
-
-        pa_id: options.pa_id ? options.pa_id : "",
-        pa_type_id: options.pa_type_id ? options.pa_type_id : "",
-
-        virtual: null,
-        activity_type_ids: options.activity_type_id
-          ? [options.activity_type_id]
-          : [],
-        contract_type_ids: options.contract_type_id
-          ? [options.contract_type_id]
-          : [],
-        market_category_ids: options.market_category_id
-          ? [options.market_category_id]
-          : [],
-        assist: {},
-        product_ids: options.data[0].ids,
-      },
-      tabs: options.data ? options.data : [],
-    });
-
-    if (this.tabs) {
-      this.tabs.map(function (value, index) {
-        if (value.title) {
-          that.tabs[index].prices = that.priceTabs(value.title);
-        }
-        if (value.options) {
-          if (typeof value.options == "string") {
-            var parse = JSON.parse(value.options);
-            that.tabs[index].sidx = parse.sidx;
-            that.tabs[index].sort = parse.sort;
-          } else {
-            that.tabs[index].sidx = value.options.sidx;
-            that.tabs[index].sort = value.options.sort;
-          }
-        }
-      });
-
-      this.prices = this.tabs[0].prices;
-      this.isShowNumber = this.tabs[0].isShowNumber;
-      this.post.sidx = this.tabs[0].sidx ? this.tabs[0].sidx : "";
-      this.post.sort = this.tabs[0].sort ? this.tabs[0].sort : "";
-      this.editSidxName();
-      //console.log(this.tabs)
-    }
-
-    if (this.post.product_ids) {
-      this.GetPlist(function () {
-        that.pdlist.length == 0
-          ? that.setData({ isdata: false })
-          : that.setData({ isdata: true });
-      });
-    } else {
-      this.isdata = false;
-      return;
-    }
-
-    uni.$on("diy-scrollbottom", function (data) {
-      console.log("监听到事件来自 update ，携带参数 uniId 为：" + data.uniId);
-
-      if (data.uniId == that.uniId) {
-        console.log("监听到 scrollbottom");
-        console.info(that.$refs);
-        that.scrollbottom();
-      }
-    });
-  },
-  watch: {
-    isFilterTop0(newVal, oldVal) {
-      console.log(newVal);
-    },
-    options(newVal, oldVal) {
-      this.setData({
-        pdlist: [],
-      });
-
-      let that = this;
-      that.ispage = true;
-
-      var post = this.post;
-      var options = this.options;
-
-      this.setData({
-        post: {
-          store_id: options.store_id,
-
-          sidx: options.sidx ? options.sidx : "product_order",
-          sort: options.sort ? options.sort : "ASC",
-
-          keywords: options.keywords,
-          store_category_ids: options.store_category_id,
-          category_id: options.category_id,
-          brand_id: options.brand_id,
-          product_tags: options.tag_id ? [options.tag_id] : [],
-          kind_id: options.kind_id,
-          store_type: options.store_type,
-          page: 1,
-
-          product_unit_price_min: options.product_unit_price_min
-            ? options.product_unit_price_min
-            : "",
-          product_unit_price_max: options.product_unit_price_max
-            ? options.product_unit_price_max
-            : "",
-
-          sp_from: options.sp_from ? options.sp_from : "",
-          sp_to: options.sp_to ? options.sp_to : "",
-
-          points_from: options.points_from ? options.points_from : "",
-          points_to: options.points_to ? options.points_to : "",
-
-          pa_id: options.pa_id ? options.pa_id : "",
-          pa_type_id: options.pa_type_id ? options.pa_type_id : "",
-
-          virtual: null,
-          activity_type_ids: options.activity_type_id
-            ? [options.activity_type_id]
-            : [],
-          contract_type_ids: options.contract_type_id
-            ? [options.contract_type_id]
-            : [],
-          market_category_ids: options.market_category_id
-            ? [options.market_category_id]
-            : [],
-          assist: {},
-          product_ids: options.data[0].ids,
-        },
-        tabs: options.data ? options.data : [],
-      });
-
-      if (this.tabs) {
-        this.tabs.map(function (value, index) {
-          if (value.title) {
-            that.tabs[index].prices = that.priceTabs(value.title);
-          }
-          if (value.options) {
-            if (typeof value.options == "string") {
-              var parse = JSON.parse(value.options);
-              that.tabs[index].sidx = parse.sidx;
-              that.tabs[index].sort = parse.sort;
-            } else {
-              that.tabs[index].sidx = value.options.sidx;
-              that.tabs[index].sort = value.options.sort;
-            }
-          }
-        });
-
-        this.prices = this.tabs[0].prices;
-        this.isShowNumber = this.tabs[0].isShowNumber;
-        this.post.sidx = this.tabs[0].sidx;
-        this.post.sort = this.tabs[0].sort;
-      }
-
-      if (this.post.product_ids) {
-        this.GetPlist(function () {
-          that.pdlist.length == 0
-            ? that.setData({ isdata: false })
-            : that.setData({ isdata: true });
-        });
-      } else {
-        this.isdata = false;
-        return;
-      }
-    },
-  },
-  methods: {
-    ...mapMutations([
-      "login",
-      "logout",
-      "getPlantformInfo",
-      "forceUserInfo",
-      "getUserInfo",
-    ]),
-    pdprice: function () {
-      this.post.sort = this.post.sort == "DESC" ? "ASC" : "DESC";
-      this.GetPlist();
-    },
-
-    /**
-     * 过滤搜索
-     */
-    onFilter: function () {
-      uni.$emit("returnTop");
-
-      var post = this.post;
-
-      post.page = 1;
-      post.activity_type_ids = [];
-      post.contract_type_ids = [];
-      post.market_category_ids = [];
-
-      var is_filter = false;
-
-      for (var i = 0; i < this.contract_row.length; i++) {
-        if (!this.contract_row[i].contract_is_unselected) {
-          post.contract_type_ids.push(this.contract_row[i].contract_type_id);
-
-          is_filter = true;
-        }
-      }
-
-      for (var i = 0; i < this.market_row.length; i++) {
-        if (!this.market_row[i].market_is_unselected) {
-          post.market_category_ids.push(this.market_row[i].market_category_id);
-
-          is_filter = true;
-        }
-      }
-
-      if (!this.inverted.gift) {
-        post.activity_type_ids.push(this.StateCode.ACTIVITY_TYPE_GIFT);
-        is_filter = true;
-      }
-
-      if (!this.inverted.groupbuy) {
-        post.activity_type_ids.push(this.StateCode.ACTIVITY_TYPE_DIY_PACKAGE);
-        is_filter = true;
-      }
-
-      if (!this.inverted.xianshi) {
-        post.activity_type_ids.push(
-          this.StateCode.ACTIVITY_TYPE_LIMITED_DISCOUNT
-        );
-        is_filter = true;
-      }
-
-      if (!this.inverted.virtual) {
-        post.virtual = 1;
-        is_filter = true;
-      } else {
-        post.virtual = null;
-      }
-
-      post.assist = {};
-
-      let ao = {};
-      for (var a = 0, lenA = this.assist.length; a < lenA; ++a) {
-        var items = this.assist[a].items;
-
-        let temp = [];
-        for (var i = 0, lenI = items.length; i < lenI; ++i) {
-          if (!items[i].assist_is_unselected) {
-            temp.push(items[i].assist_item_id);
-          }
-        }
-
-        if (temp.length > 0) {
-          ao[this.assist[a].assist_id] = temp;
-        }
-      }
-
-      /*
-      post.assist = JSON.stringify(ao);
-      post.activity_type_ids = JSON.stringify(post.activity_type_ids);
-      post.contract_type_ids = JSON.stringify(post.contract_type_ids);
-      post.market_category_ids = JSON.stringify(post.market_category_ids);
-      */
-      console.info(JSON.stringify(this.assist));
-      console.info(JSON.stringify(ao));
-
-      post.assist = ao;
-      post.activity_type_ids = post.activity_type_ids;
-      post.contract_type_ids = post.contract_type_ids;
-      post.market_category_ids = post.market_category_ids;
-
-      this.setData({
-        pdlist: [],
-        post: post,
-        is_filter: is_filter,
-      });
-
-      this.GetPlist();
-
-      this.rightDrawerVisible = false;
-    },
-
-    editSidxName: function () {
-      console.log(this.post.sidx);
-      if (this.post.sidx == "product_unit_price") {
-        this.sidxName = "价格";
-      } else if (this.post.sidx == "product_sale_num") {
-        this.sidxName = "销量";
-      } else if (this.post.sidx == "product_favorite_num") {
-        this.sidxName = "收藏";
-      } else if (this.post.sidx == "product_add_time") {
-        this.sidxName = "新品";
-      } else if (this.post.sidx == "product_order") {
-        this.sidxName = "排序";
-      }
-    },
-    priceTabs: function (priceList) {
-      if (priceList) {
-        var list = priceList.split(",");
-        var price = [];
-        for (var i in list) {
-          i = parseInt(i);
-          if (list[i + 1]) {
-            if (i == 0) {
-              price.push({
-                from: list[i],
-                to: parseFloat(list[i + 1]),
-                title: parseFloat(list[i]) + "-" + list[i + 1],
-              });
-            } else {
-              price.push({
-                from: parseFloat(list[i]) + 1,
-                to: parseFloat(list[i + 1]),
-                title: parseFloat(list[i]) + 1 + "-" + list[i + 1],
-              });
-            }
-          } else {
-            price.push({
-              from: parseFloat(list[i]),
-              to: 0,
-              title: list[i] + "以上",
-            });
-          }
-        }
-
-        return price;
-        console.log(this.prices);
-      }
-    },
-    selectPriceIndex: function (index) {
-      var that = this;
-      this.priceIndex = index;
-      this.post.product_unit_price_min = this.prices[index].from;
-      this.post.product_unit_price_max = this.prices[index].to;
-    },
-
-    switchTabs: function (index) {
-      var that = this;
-      var tab = this.tabs[index];
-      this.setData({
-        key: index,
-        prices: tab.prices,
-        priceIndex: -1,
-        isShowNumber: tab.isShowNumber,
-      });
-      this.post.product_unit_price_min = 0;
-      this.post.product_unit_price_max = 0;
-      this.post.sidx = tab.sidx ? tab.sidx : "";
-      this.post.sort = tab.sort ? tab.sort : "";
-      this.post.page = 1;
-      this.post.product_ids = tab.ids;
-      console.log(tab);
-      this.editSidxName();
-
-      if (this.post.product_ids.length > 0) {
-        this.GetPlist(function () {
-          that.pdlist.length == 0
-            ? that.setData({ isdata: false })
-            : that.setData({ isdata: true });
-        });
-      } else {
-        this.isdata = false;
-        return;
-      }
-    },
-
-    assistItemReset: function (e) {
-      var aid = parseInt(e.target.dataset.aid);
-
-      let assist = this.assist.concat();
-      var items = assist[aid].items;
-
-      for (var i = 0, lenI = items.length; i < lenI; ++i) {
-        items[i].checked = false;
-      }
-
-      this.setData({ assist: assist });
-    },
-
-    assistItemChange: function (e) {
-      var values = e.detail.value;
-      var aid = parseInt(e.target.dataset.aid);
-
-      let assist = this.assist.concat();
-      var items = assist[aid].items;
-
-      for (var i = 0, lenI = items.length; i < lenI; ++i) {
-        items[i].checked = false;
-        for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
-          if (items[i].assist_item_id == values[j]) {
-            items[i].checked = true;
-            break;
-          }
-        }
-      }
-
-      this.setData({ assist: assist });
-    },
-    assistItemRadionChange: function (e) {
-      var value = e.target.value;
-      var aid = parseInt(e.target.dataset.aid);
-
-      let assist = this.assist.concat();
-      var items = assist[aid].items;
-
-      for (var i = 0, lenI = items.length; i < lenI; ++i) {
-        items[i].checked = false;
-        if (items[i].assist_item_id == value) {
-          items[i].checked = true;
-          break;
-        }
-      }
-
-      this.setData({ assist: assist });
-    },
-    scrollbottom: function (e) {
-      if (this.flag) {
-        var that = this;
-        that.setData({ flag: false }), clearTimeout(n);
-
-        var post = this.post;
-        /*
-                post.sidx = 'product_unit_price_min';
-                post.sort = this.sort == 1 ? 'DESC' : 'ASC';
-        */
-        post.page = parseInt(that.post.page) + 1;
-
-        var n = setTimeout(function () {
-          that.setData({
-            post: post,
-          }),
-            that.GetPlist();
-        }, 500);
-      }
-    },
-
-    /*
-     * 读取商品数据
-     */
-    GetPlist: function (callback) {
-      let url = this.Config.URL.pt.list;
-
-      if (this.isGuessFlag) {
-        url = this.Config.URL.pt.guess;
-      }
-
-      this.setData({ flag: false });
-      var that = this;
-
-      let params = Object.assign({}, that.post);
-
-      //转为逗号分割
-      let assistItemIds = [];
-
-      for (var assistId in that.post.assist) {
-        var items = that.post.assist[assistId];
-
-        for (var i = 0, lenI = items.length; i < lenI; ++i) {
-          assistItemIds.push(items[i]);
-        }
-      }
-
-      params.product_assist_data = assistItemIds.join(",");
-      params.activity_type_ids = that.post.activity_type_ids.join(",");
-      params.contract_type_ids = that.post.contract_type_ids.join(",");
-      params.market_category_ids = that.post.market_category_ids.join(",");
-      params.product_tags = that.post.product_tags.join(",");
-      params.item_id = that.post.product_ids;
-
-      that.$.request({
-        url: this.Config.URL.pt.listItem,
-        data: params,
-        loading: false,
-        method: "GET",
-        ajaxCache: {
-          timeout: this.Config.CACHE_EXPIRE,
-        },
-        success: function (data, status, msg, code) {
-          that.setData({
-            pdlist: [],
-          });
-
-          for (var i = 0; i < data.items.length; i++) {
-            data.items[i]["id"] = data.items[i]["item_id"];
-            data.items[i]["DefaultProductSkuId"] = data.items[i]["item_id"];
-            data.items[i]["ProductName"] = data.items[i]["product_name"];
-            data.items[i]["ProductTips"] = data.items[i]["product_tips"];
-            data.items[i]["SalesName"] = data.items[i]["product_name"];
-            data.items[i]["ProductPic"] = data.items[i]["product_image"];
-            data.items[i]["ItemSalePrice"] = parseFloat(
-              data.items[i]["item_unit_price"]
-            );
-            data.items[i]["SaleNum"] = data.items[i]["product_sale_num"];
-            data.items[i]["Stock"] = data.items[i]["product_quantity"];
-            data.items[i]["DefaultProductSkuId"] = data.items[i]["item_id"];
-            data.items[i]["user_cart_quantity"] = 1;
-
-            //数据转换
-            if (
-              data.items[i]["product_spec"] &&
-              that.$.isJson(data.items[i]["product_spec"])
-            ) {
-              data.items[i]["product_spec"] = JSON.parse(
-                data.items[i]["product_spec"]
-              );
-            } else {
-              data.items[i]["product_spec"] = [];
-            }
-
-            if (
-              data.items[i]["product_uniqid"] &&
-              that.$.isJson(data.items[i]["product_uniqid"])
-            ) {
-              data.items[i]["product_uniqid"] = JSON.parse(
-                data.items[i]["product_uniqid"]
-              );
-            } else {
-              data.items[i]["product_uniqid"] = [];
-            }
-
-            data.items[i]["HasManualSku"] =
-              data.items[i]["product_spec"].length > 1;
-          }
-
-          if (200 == status && data.items.length > 0) {
-            if (data.page >= data.total || data.page >= that.maxNumber) {
-              that.setData({
-                flag: false,
-                ispage: false,
-                pdlist: that.pdlist.concat(data.items),
-              });
-            } else {
-              that.setData({
-                flag: true,
-                ispage: true,
-                pdlist: that.pdlist.concat(data.items),
-              });
-            }
-
-            that.setData({
-              isdata: true,
-            });
-          } else {
-            that.setData({
-              flag: false,
-              ispage: false,
-              isdata: false,
-            });
-          }
-
-          callback && callback();
-        },
-      });
-    },
-
-    scrolltoupper: function (t) {
-      this.old.scposition = t.detail.scrollTop;
-    },
-    returnTop: function () {
-      var that = this;
-
-      // 解决view层不同步的问题
-      that.setData({
-        scposition: this.old.scposition,
-      });
-
-      this.$nextTick(function () {
-        that.setData({
-          scposition: 0,
-        });
-      });
-    },
-    onCloseFilter() {
-      this.rightDrawerVisible = false;
-    },
-    onOpenFilter() {
-      this.rightDrawerVisible = true;
-
-      //
-      let that = this;
-
-      if (!that.post.category_id) {
-        return;
-      }
-
-      if (that.assist.length == 0) {
-        that.$.request({
-          url: that.Config.URL.pt.listFilter,
-          data: { category_id: that.post.category_id },
-          ajaxCache: {
-            timeout: this.Config.CACHE_EXPIRE,
-          },
-          success: function (data, status, msg, code) {
-            let contracts = data.contracts;
-
-            for (var i = 0; i < contracts.length; i++) {
-              contracts[i].contract_is_unselected = true;
-            }
-
-            that.setData({ contract_row: contracts });
-
-            let markets = data.markets;
-
-            for (var i = 0; i < markets.length; i++) {
-              markets[i].market_is_unselected = true;
-            }
-
-            that.setData({ market_row: markets });
-
-            //筛选辅助属性
-            for (var i = 0; i < data.assists.length; i++) {
-              for (var j = 0; j < data.assists[i]["items"].length; j++) {
-                data.assists[i]["items"][j].assist_is_unselected = true;
-              }
-            }
-
-            that.setData({
-              assist: data.assists,
-            });
-          },
-        });
-      }
-    },
-
-    setType(type) {
-      this.inverted[type] = !this.inverted[type];
-    },
-
-    setContract(index) {
-      this.contract_row[index].contract_is_unselected =
-        !this.contract_row[index].contract_is_unselected;
-    },
-
-    setMarket(index) {
-      console.info(this.market_row[index]);
-      this.market_row[index].market_is_unselected =
-        !this.market_row[index].market_is_unselected;
-    },
-
-    setAssist(aid, index) {
-      console.info(this.assist[aid]["items"][index]);
-      this.assist[aid]["items"][index].assist_is_unselected =
-        !this.assist[aid]["items"][index].assist_is_unselected;
-    },
-  },
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import "../styles/_variables.scss";
-
-.m-navbar {
-  background-color: #f5f5f5;
-  padding: 0 24rpx;
-}
-
-/*全部商品 start*/
-.m-navbar-item {
-  // width:172rpx;
-  padding: 20rpx;
-  font-size: 28rpx;
-  height: 36rpx;
-  font-family: PingFangSC-Semibold, PingFang SC;
-  font-weight: 600;
-  color: #222222;
-  line-height: 40rpx;
-  letter-spacing: 1rpx;
-  position: relative;
-  // overflow: hidden;
-  // white-space: nowrap;
-  // text-overflow: ellipsis;
-  i {
-    font-size: 0rpx;
-    line-height: 0;
-    vertical-align: middle;
-    display: inline-block;
-    width: 0rpx;
-    height: 0rpx;
-    margin-left: 9.375rpx;
-    border-width: 9.375rpx;
-    border-color: #aaa transparent transparent transparent;
-    border-style: solid dashed dashed dashed;
-  }
-}
-
-.m-navbar-item:after {
-  border: none;
-}
-
-.m-sort {
-  position: relative;
-}
-
-.m-sort image {
-  width: 24rpx;
-  height: 24rpx;
-  position: absolute;
-  /*top: 50%;*/
-  margin-top: 10rpx;
-  margin-left: 2rpx;
-}
-
-/*全部商品 end*/
-.m-product-price1 {
-  display: flex;
-  justify-content: space-between;
-
-  label {
-    font-weight: initial;
-  }
-}
-
-.m-listv {
-  .m-product-price1 {
-    width: 312rpx;
-  }
-}
-
-.num {
-  font-size: 24rpx;
-  color: #717171;
-  // padding-right: 20rpx;
-  /*margin-left:260rpx; */
-}
-
-.u-pa .m-tab {
-  top: var(--window-top);
-}
-
-.u-pa .m-tab-top {
-  top: 0;
-}
-
-.u-pa .m-tab-fixed {
-  position: fixed !important;
-}
-
-.filter-box {
-  top: var(--window-top);
-}
-
-.filter-box-top {
-  top: 0;
-}
-
-.tag-view {
-  margin: 10rpx 20rpx;
-  display: inline-block;
-}
-
-.uni-numbox-value {
-  border: 2rpx solid #cccccc;
-  background-color: #ffffff;
-  width: 150rpx;
-  height: 48rpx;
-  text-align: center;
-  display: inline-block;
-}
-
-.uni-dot {
-  width: 30rpx;
-  height: 100%;
-  text-align: center;
-  display: inline-block;
-  line-height: 44rpx;
-  height: 44rpx;
-}
-
-.uni-padding-wrap {
-  overflow: hidden;
-  max-width: 400rpx;
-}
-
-/* */
-.product-list {
-  position: relative;
-  z-index: 1;
-
-  &:hover {
-    z-index: 2;
-  }
-
-  .no_goods {
-    .no_shadow {
-      height: 100%;
-      width: 100%;
-      position: absolute;
-      z-index: 11;
-      opacity: 0.7;
-      background-color: #b2b2b2;
-    }
-
-    .no_goods_tip {
-      height: 100%;
-      width: 100%;
-      position: absolute;
-      left: 0;
-      top: 0;
-      z-index: 12;
-      text-align: center;
-      height: 60rpx;
-      line-height: 60rpx;
-    }
-
-    position: absolute;
-    z-index: 10;
-    height: 60rpx;
-    line-height: 60rpx;
-    color: #fff;
-    font-size: 26rpx;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-  }
-
-  .flag {
-    position: absolute;
-    top: 0;
-    left: 50%;
-    z-index: 2;
-    width: 64px;
-    height: 20px;
-    margin-left: -32px;
-    font-size: 12px;
-    line-height: 20px;
-    text-align: center;
-    color: #fff;
-  }
-
-  .flag-reduction {
-    background-color: #e50dbb;
-    z-index: 8;
-  }
-
-  .flag-saleoff {
-    background-color: #e53935;
-    z-index: 7;
-  }
-
-  .flag-postfree {
-    background-color: #ffac13;
-    z-index: 6;
-  }
-
-  .flag-bargain {
-    background-color: #ffac13;
-    z-index: 4;
-  }
-
-  .flag-gift {
-    background-color: #2196f3;
-    z-index: 3;
-  }
-
-  .flag-new {
-    background-color: #83c44e;
-    z-index: 5;
-  }
-
-  .flag-selfsupport {
-    background-color: #f44336;
-    z-index: 10;
-
-    position: absolute;
-
-    top: 1px;
-    right: 5px;
-    left: auto;
-    width: 40px;
-  }
-}
-
-.placeholder-class {
-  font-size: 25rpx;
-}
-
-.button {
-  line-height: 2;
-  font-size: 34rpx;
-}
-
-.uni-common-mt {
-  margin-top: 20rpx;
-}
-
-.u-pa {
-  position: inherit !important;
-}
-
-.u-pa .m-product-list {
-  padding-top: 0rpx;
-}
-
-.u-pa .m-tab {
-  position: relative;
-}
-
-.m-product-box {
-  margin-top: calc(var(--window-top) + 4rpx);
-}
-
-.dropItem {
-}
-
-.u-pa .m-product-list {
-}
-
-.m-listv .m-product-item:nth-child(1) {
-  margin-top: 20rpx !important;
-}
-
-.m-listv .m-product-item:nth-child(2) {
-  margin-top: 20rpx !important;
-}
-
-.m-listv .m-product-item:nth-child(odd) {
-  margin-left: 0;
-}
-
-.m-listv .m-product-item:nth-child(even) {
-  margin-right: 0;
-}
-
-.scroll-view_H {
-  width: 100%;
-  white-space: nowrap;
-
-  .m-navbar-item {
-    display: inline-block;
-
-    .active-icon {
-      position: absolute;
-      bottom: 0rpx;
-      right: -10rpx;
-      color: $default-skin-bg;
-
-      &:before {
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.money {
-  font-size: 32rpx;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: $default-skin-bg;
-  line-height: 50rpx;
-}
-
-.add-cart {
-  width: 50rpx;
-  height: 50rpx;
-  background: $default-skin-bg;
-  border-radius: 18rpx;
-  text-align: center;
-  line-height: 50rpx;
-}
-
-.filter-item {
-  display: inline-block;
-
-  padding: 10rpx 18rpx;
-  margin-right: 30rpx;
-  margin-top: 4rpx;
-  font-size: 28rpx;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #222222;
-  line-height: 40rpx;
-  line-height: 32rpx;
-
-  margin-bottom: 4rpx;
-}
-
-.filter-item-on {
-  color: $default-skin-bg;
-  border-radius: 34rpx;
-  border: 2rpx solid $default-skin-bg;
-}
-
-.m-listv .m-product-name2 {
-  line-height: 32rpx;
-  height: 64rpx;
-}
-
-.item-on {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #222222;
-  line-height: 44rpx;
-  margin-left: -10px;
-}
-
-.m-navbar-info {
-  display: flex;
-  justify-content: space-between;
-}
-
-.m-img-number {
-  position: absolute;
-  top: 20rpx;
-  left: 18rpx;
-  width: 54rpx;
-  height: 56rpx;
-  z-index: 2;
-  background-repeat: no-repeat;
-  background-size: 54rpx 56rpx;
-
-  span {
-    font-size: 32rpx;
-    font-family: PingFangSC-Semibold, PingFang SC;
-    font-weight: 600;
-    color: #ffffff;
-    line-height: 44rpx;
-  }
-}
-
-.m-img-0 {
-  background-image: url("https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/rank/1.png");
-}
-
-.m-img-1 {
-  background-image: url("https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/rank/2.png");
-}
-
-.m-img-2 {
-  background-image: url("https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/rank/3.png");
-}
-
-.m-img-3 {
-  background-image: url("https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/rank/4.png");
-}
-
-.m-screen {
-  font-size: 28rpx;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #222222;
-  line-height: 40rpx;
-
-  .sort-img {
-    width: 20rpx;
-    height: 12rpx;
-    margin-top: 2px;
-  }
-}
-
-.tab-filter {
-  width: 100%;
-  height: 60rpx;
-}
-
-::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  color: transparent;
-  display: none;
-}
-</style>
diff --git a/components/pay-box.vue b/components/pay-box.vue
deleted file mode 100644
index c1f9093..0000000
--- a/components/pay-box.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template name="pay-box">
-	<block></block>
-</template>
-
-<script>
-	export default {
-        name: "pay-box",
-        props: {
-            shareDataDefault: {
-                type: Object,
-                default() {
-                    return {
-                        shareTitle: '',
-                        shareText: '',
-                        href: '',
-                        image: ''
-                    }
-                },
-            },
-        },
-		data(){
-			return {
-                showBoxView:false,
-                shareType:0
-			}
-		},
-		created() {
-            uni.getProvider({
-                service: "share",
-                success: (e) => {
-                    //console.log("success", e);
-                    let data = []
-                    for (let i = 0; i < e.provider.length; i++) {
-                        switch (e.provider[i]) {
-                            case 'weixin':
-                                data.push({
-                                    name: '分享到微信好友',
-                                    id: 'weixin',
-                                    sort: 0
-                                })
-                                data.push({
-                                    name: '分享到微信朋友圈',
-                                    id: 'weixin',
-                                    type: 'WXSenceTimeline',
-                                    sort: 1
-                                })
-                                break;
-                            case 'sinaweibo':
-                                data.push({
-                                    name: '分享到新浪微博',
-                                    id: 'sinaweibo',
-                                    sort: 2
-                                })
-                                break;
-                            case 'qq':
-                                data.push({
-                                    name: '分享到QQ',
-                                    id: 'qq',
-                                    sort: 3
-                                })
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                    this.providerList = data.sort((x, y) => {
-                        return x.sort - y.sort
-                    });
-                },
-                fail: (e) => {
-                    //console.log("获取登录通道失败", e);
-                    uni.showModal({
-                        content: "获取登录通道失败",
-                        showCancel: false
-                    })
-                }
-            });
-		},
-		methods:{
-
-            share() {
-                if (this.providerList.length === 0) {
-                    uni.showModal({
-                        title: '当前环境无分享渠道!',
-                        showCancel: false
-                    })
-                    return;
-                }
-
-                let itemList = this.providerList.map(function (value) {
-                    return value.name
-                })
-
-                var that = this;
-
-                uni.showActionSheet({
-                    itemList: itemList,
-                    success: (res) => {
-                        uni.share({
-                            provider: this.providerList[res.tapIndex].id,
-                            scene: this.providerList[res.tapIndex].type && this.providerList[res.tapIndex].type === 'WXSenceTimeline' ? 'WXSenceTimeline' : "WXSceneSession",
-                            type: this.shareType,
-
-							summary : this.shareDataDefault.shareText,
-							imageUrl : this.shareDataDefault.image,
-							title : this.shareDataDefault.shareTitle,
-                        	href : this.shareDataDefault.href,
-
-                            success: (res) => {
-                                //console.log("success:" + JSON.stringify(res));
-                            },
-                            fail: (e) => {
-                                uni.showModal({
-                                    //content: e.errMsg,
-                                    content: '用户取消',
-                                    showCancel:false
-                                })
-                            }
-                        });
-                    }
-                })
-            },
-
-			save(){
-				uni.showActionSheet({
-					itemList:['保存图片到相册'],
-					success: () => {
-						plus.gallery.save('https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/app_download.png', function() {
-							uni.showToast({
-								title:'保存成功',
-								icon:'none'
-							})
-						}, function() {
-							uni.showToast({
-								title:'保存失败，请重试！',
-								icon:'none'
-							})
-						});
-					}
-				})
-			},
-
-            cancel() {
-                this.showBoxView = false;
-                this.$emit('onCancel');
-            },
-            show() {
-                this.share();
-            }
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/components/robby-tags.vue b/components/robby-tags.vue
deleted file mode 100644
index a5429d4..0000000
--- a/components/robby-tags.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-	<view class="tagController">
-		<view class="tagContainer">
-			<view class="tagItem" :class="tagBgColor" v-bind:key="index" v-for="(tagText,index) in value">
-				<text @tap="tapTag" :data-text="tagText">{{tagText}}</text>
-				<text v-if="isShowDelIcon" class="tagDelIcon" @tap="delTag" :data-text="tagText">x</text>
-			</view>
-		</view>
-		<view class="tagInput" v-if="isShowAdd">
-			<input type="text" v-model="tagString" placeholder-class="placeholder-class" placeholder="输入新的标签" />
-			<button type="default" size="mini" @tap="createTags">添加</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name:'robby-tags',
-		props: ['enableDel','bgColorType','value', 'enableAdd'],
-		data() {
-			return {
-				tagString:'',
-				isShowDelIcon: this.enableDel || false,
-				isShowAdd: this.enableAdd || false
-			}
-		},
-		computed:{
-			tagBgColor: function(){
-				if(this.bgColorType === null){
-					return 'tagBgDefault'
-				}else if(this.bgColorType === 'primary'){
-					return 'tagBgPrimary'
-				}else if(this.bgColorType === 'success'){
-					return 'tagBgSuccess'
-				}else if(this.bgColorType === 'warn'){
-					return 'tagBgWarning'
-				}else if(this.bgColorType === 'error'){
-					return 'tagBgError'
-				}else{
-					return 'tagBgDefault'
-				}
-			}
-		},
-		methods: {
-			createTags: function(){
-				let tempTagArr = []
-				if(this.tagString.length>0){
-					let newvalue = this.tagString.split(/,|，/)
-					for(let i=0;i<newvalue.length;i++){
-						let newTag = newvalue[i].trim()
-						
-						if(newTag !== '' && this.value.indexOf(newTag) < 0){
-							tempTagArr.push(newTag)
-						}
-					}
-				}
-				this.tagString = ''
-				this.value.splice(this.value.length,0, ...tempTagArr)
-				this.$emit('add', {
-					currentTag: tempTagArr,
-					allTags: this.value
-				})
-				this.$emit('input', this.value)
-			}, 
-			delTag: function(e){
-				let delTagText = e.currentTarget.dataset.text
-				let delTagIndex = this.value.indexOf(delTagText)
-				this.value.splice(delTagIndex,1)
-				this.$emit("delete", {
-					currentTag: delTagText,
-					allTags: this.value
-				})
-				this.$emit('input', this.value)
-			},
-			tapTag: function(e){
-				let selTagText = e.currentTarget.dataset.text
-				this.$emit("click", selTagText)
-			}
-		}
-	}
-</script>
-
-<style>
-	
-	.placeholder-class{
-		font-size: 24rpx;
-	}
-	.tagController{
-		padding: 10rpx;
-	}
-	.tagContainer{
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-	}
-	.tagItem{
-		padding: 10rpx 20rpx;
-		margin: 10rpx;
-		border-radius: 40rpx;
-		color: white;
-	}
-	.tagBgDefault{
-		background-color: #cfcfcf;
-		color: black;
-	}
-	.tagBgPrimary{
-		background-color: #007aff;
-	}
-	.tagBgSuccess{
-		background-color: #4cd964;
-	}
-	.tagBgWarning{
-		background-color: #f0ad4e;
-	}
-	.tagBgError{
-		background-color: #dd524d;
-	}
-	.tagDelIcon{
-		padding-left: 20rpx;
-	}
-	.tagInput{
-		padding: 10rpx;
-	}
-	.tagInput input{
-		width: 60%;
-		display: inline-block;
-	}
-</style>
\ No newline at end of file
diff --git a/components/shop-category.vue b/components/shop-category.vue
deleted file mode 100644
index e7eb12a..0000000
--- a/components/shop-category.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
-    <view>
-		<!-- 商品分类 -->
-		<uni-drawer :visible="rightDrawerVisible" mode="right" @close="closeDrawer()" >
-			<view class="m-tab">
-				<view class="m-navbar">
-					<view :class="['m-navbar-item', tapindex==1?'m-navbar-item-on':'']" @click="onecategorys">
-						{{__('一级分类')}}
-					</view>
-					<view :class="['m-navbar-item', tapindex==2?'m-navbar-item-on':'']">
-						{{__('二级分类')}}
-					</view>
-					<view :class="['m-navbar-item', tapindex==3?'m-navbar-item-on':'']">
-						{{__('三级分类')}}
-					</view>
-				</view>
-			</view>
-			<scroll-view scroll-y="true" style="height: 100%">
-				<view class="m-cells" style="padding:20rpx 20rpx;" v-for="(category,ii) in categorys" :key="ii">
-					<view class="m-cell m-cell-access m-info-sp" :data-category_id="category.category_id" :data-category_name="category.category_name"  @click="getCate">
-						<view class="m-cell-bd">
-							<view  class="m-order-title">
-								<label class="m-ber-n">{{category.category_name}}</label>
-								<label>
-									<image  class="nav-image" lazy-load src="/static/images/nav.png" mode="scaleToFill" />
-								</label>
-							</view>
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</uni-drawer>
-    </view>
-</template>
-
-
-<script>
-import uniDrawer from '@/components/uni-drawer.vue';
-import { mapState, mapMutations } from 'vuex';
-
-export default {
-		props: {
-			rightDrawerVisible: {
-				type: Boolean,
-				default: false
-			}
-		},
-    data() {
-        return {
-			index:0,
-			tapindex: 1,
-			deep:0,
-			categorys:[]
-        };
-    },
-
-    components: {
-        uniDrawer
-    },
-    computed: mapState([
-        'Config',
-        'StateCode',
-        'notice',
-        'plantformInfo',
-        'shopInfo',
-        'userInfo',
-        'hasLogin'
-    ]),
-    created() {
-        var that = this;
-
-        this.GetPlist(function() {
-            that.pdlist.length == 0 ? that.setData({ isdata: false }) : that.setData({ isdata: true });
-        });
-    },
-    methods: {
-        ...mapMutations(['login', 'logout', 'getPlantformInfo', 'forceUserInfo', 'getUserInfo']),
-
-		onecategorys: function(){
-			this.setData({
-				deep:1,
-				category_id:0,
-				tapindex:1
-			})
-			this.getcategorys()
-		},
-		getCate: function(e){
-			var that = this;
-			switch (that.tapindex) {
-				case 1:
-					that.setData({
-						deep:that.tapindex,
-						category_id:e.currentTarget.dataset.category_id,
-						onecategory:e.currentTarget.dataset.category_name,
-						tapindex:2
-					})
-					that.getcategorys()
-					break;
-				case 2:
-					that.setData({
-						deep:that.tapindex,
-						category_id:e.currentTarget.dataset.category_id,
-						twocategory:e.currentTarget.dataset.category_name,
-						tapindex:3
-					})
-					that.getcategorys()
-					break;
-				case 3:
-					that.setData({
-						threecategory:e.currentTarget.dataset.category_name,
-						category_id:e.currentTarget.dataset.category_id,
-						tapindex:1,
-						deep:1,
-						rightDrawerVisible:false
-					})
-					that.commodity_name = that.onecategory + '>' + that.twocategory + '>' + that.threecategory
-					break;
-			}
-		},
-
-		getcategorys: function(e){
-			var that = this;
-			var	params = {
-				deep:that.deep
-			};
-
-			if(that.category_id !== 0){
-				params.category_id= that.category_id
-
-			}
-			that.$.request({
-				url: that.Config.URL.product.category,
-				data: params,
-				success: function(data, status, msg, code) {
-					if(status ==  200){
-						that.setData({
-							categorys:data.items
-						})
-					}
-				}
-			})
-		}
-	}
-};
-</script>
-
-
-<style lang="scss" scoped>
-@import '../styles/_variables.scss';
-
-/*全部商品 start*/
-.m-navbar-item {
-    padding: 20rpx 0;
-    font-size: 24rpx;
-    i {
-        font-size: 0rpx;
-        line-height: 0;
-        vertical-align: middle;
-        display: inline-block;
-        width: 0rpx;
-        height: 0rpx;
-        margin-left: 9.375rpx;
-        border-width: 9.375rpx;
-        border-color: #aaa transparent transparent transparent;
-        border-style: solid dashed dashed dashed;
-    }
-}
-.m-navbar-item:after {
-    border: none;
-}
-.m-navbar-item.m-navbar-item-on {
-    background-color: #fff;
-    color: $default-skin-bg;
-    i {
-        border-color: $default-skin-bg transparent transparent;
-    }
-}
-.m-navbar-item.m-navbar-item-on::before {
-    content: ' ';
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 6rpx;
-    border-bottom: 6rpx solid $default-skin-bg;
-    color: #cccccc;
-    -webkit-transform-origin: 0 100%;
-    transform-origin: 0 100%;
-    -webkit-transform: scaleY(0.5);
-    transform: scaleY(0.5);
-    z-index: 3;
-}
-.m-sort {
-    position: relative;
-}
-.m-sort image {
-    width: 24rpx;
-    height: 24rpx;
-    position: absolute;
-    /*top: 50%;*/
-    margin-top: 10rpx;
-    margin-left: 2rpx;
-}
-/*全部商品 end*/
-.m-product-price1 {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-}
-.num {
-    font-size: 24rpx;
-    color: #717171;
-    padding-right: 20rpx;
-    /*margin-left:260rpx; */
-}
-
-.u-pa .m-tab {
-    top: var(--window-top);
-}
-.u-pa .m-tab-top {
-    top: 0;
-}
-
-.filter-box {
-    top: var(--window-top);
-}
-
-.filter-box-top {
-    top: 0;
-}
-
-.tag-view {
-    margin: 10rpx 20rpx;
-    display: inline-block;
-}
-
-.uni-numbox-value {
-    border: 2rpx solid #cccccc;
-    background-color: #ffffff;
-    width: 150rpx;
-	height: 48rpx;
-    text-align: center;
-    display: inline-block;
-}
-.uni-dot {
-    width: 30rpx;
-    height: 100%;
-    text-align: center;
-    display: inline-block;
-    line-height: 44rpx;
-    height: 44rpx;
-}
-
-.uni-padding-wrap {
-    overflow: hidden;
-    max-width: 400rpx;
-}
-
-
-
-
-/* */
-.product-list {
-  position: relative;
-  z-index: 1;
-  &:hover {
-    z-index: 2;
-  }
-  .flag {
-    position: absolute;
-    top: 0;
-    left: 50%;
-    z-index: 2;
-    width: 64px;
-    height: 20px;
-    margin-left: -32px;
-    font-size: 12px;
-    line-height: 20px;
-    text-align: center;
-    color: #fff;
-  }
-  .flag-reduction {
-    background-color: #e50dbb;
-    z-index: 8;
-  }
-
-  .flag-saleoff {
-    background-color: #e53935;
-    z-index: 7;
-  }
-
-  .flag-postfree {
-    background-color: #ffac13;
-    z-index: 6;
-  }
-
-  .flag-bargain {
-    background-color: #ffac13;
-    z-index: 4;
-  }
-
-  .flag-gift {
-    background-color: #2196f3;
-    z-index: 3;
-  }
-
-  .flag-new {
-    background-color: #83c44e;
-    z-index: 5;
-  }
-
-  .flag-selfsupport {
-    background-color: #f44336;
-    z-index: 10;
-
-    position: absolute;
-
-    top: 1px;
-    right: 5px;
-    left: auto;
-    width: 40px;
-  }
-}
-
-.placeholder-class{
-	font-size: 25rpx;
-}
-
-.button{
-	line-height: 2;
-	font-size: 34rpx;
-}
-
-.uni-common-mt{
-	margin-top: 20rpx;
-}
-
-
-.u-pa {
-    position: inherit!important;
-}
-
-.u-pa .m-product-list
-{
-	padding-top:0rpx;
-}
-
-.u-pa .m-tab{
-	position: relative;
-}
-</style>
diff --git a/components/themes/diy.vue b/components/themes/diy.vue
index 98fd067..8d7570f 100644
--- a/components/themes/diy.vue
+++ b/components/themes/diy.vue
@@ -1,543 +1,894 @@
 <template name="diy">
-    <view v-if="loadPageFlag" class="diyPage" :style="{background:(BgConfig.BackgroundObj.type==1?BgConfig.BackgroundObj.bgColor:('url('+BgConfig.BackgroundObj.path+') no-repeat '+ BgConfig.BackgroundObj.pathColor)), backgroundSize:'100% auto'}">
+  <view v-if="loadPageFlag" class="diyPage" :style="{
+    background:
+      BgConfig.BackgroundObj.type == 1
+        ? BgConfig.BackgroundObj.bgColor
+        : 'url(' +
+        BgConfig.BackgroundObj.path +
+        ') no-repeat ' +
+        BgConfig.BackgroundObj.pathColor,
+    backgroundSize: '100% auto',
+  }">
 
-        <view v-for="(item, i) in PageContent" class="dropItem" :key="i" :style="{
-                        clear: (item.eltmType==1 || item.eltmType==3) ? 'none' : 'both',
-                        paddingTop:(item.paddingTop||0)*2+'rpx',
-                        paddingBottom:(item.paddingBottom||0)*2+'rpx',
-                        paddingLeft:(item.paddingLeft||0)*2+'rpx',
-                        paddingRight:(item.paddingRight||0)*2+'rpx',
-                        width:(375-(item.paddingLeft||0)-(item.paddingRight||0))*2+'rpx'}">
-            <!--第一个模板-->
-            <view :data-id="(item.eltm1.data.did)" :data-name="(item.eltm1.data.name)" :data-type="(item.eltm1.data.selectType)"
-                  :data-keyword="(item.eltm1.data.keyWord || '')" :data-appid="(item.eltm1.data.AppId || '')" :data-appurl="(item.eltm1.data.AppUrl)"
-                  :data-MinAppUrl="(item.eltm1.data.MinAppUrl || '')" @click="tplGoToPage" v-if="item.eltmType==1" :class="{boxFlexItem1:item.flexNum==1,boxFlexItem2:item.flexNum==2,boxFlexItem3:item.flexNum==3,boxFlexItem4:item.flexNum==4,boxFlexItem5:item.flexNum==5,ms:1==1,s1:item.eltm1.layout==1,s2h:item.eltm1.layout==2,s2v:item.eltm1.layout==3,s4h:item.eltm1.layout==4,s4v:item.eltm1.layout==5,s8h:item.eltm1.layout==6,s8v:item.eltm1.layout==7,s16:item.eltm1.layout==8,s250h:item.eltm1.layout==9,fl:item.eltm1.align==1,fr:item.eltm1.align==2,borderStyle:item.eltm1.border}"
-                  :style="{width:item.eltm1.width+'rpx',height:item.eltm1.height+'rpx',paddingTop:item.eltm1.paddingTop+'px',  paddingRight:item.eltm1.paddingRight+'px', paddingBottom:item.eltm1.paddingBottom+'px', paddingLeft:item.eltm1.paddingLeft+'px', backgroundColor:item.bgColor}">
-                <image lazy-load mode="scaleToFill" :src="(item.eltm1.data.path)"></image>
+    <view v-for="(item, i) in PageContent" class="dropItem" :key="i" :style="{
+      clear: item.eltmType == 1 || item.eltmType == 3 ? 'none' : 'both',
+      paddingTop: (item.paddingTop || 0) * 2 + 'rpx',
+      paddingBottom: (item.paddingBottom || 0) * 2 + 'rpx',
+      paddingLeft: (item.paddingLeft || 0) * 2 + 'rpx',
+      paddingRight: (item.paddingRight || 0) * 2 + 'rpx',
+      width:
+        (375 - (item.paddingLeft || 0) - (item.paddingRight || 0)) * 2 +
+        'rpx',
+    }">
+
+      <view :data-id="item.eltm1.data.did" :data-name="item.eltm1.data.name" :data-type="item.eltm1.data.selectType"
+        :data-keyword="item.eltm1.data.keyWord || ''" :data-appid="item.eltm1.data.AppId || ''"
+        :data-appurl="item.eltm1.data.AppUrl" :data-MinAppUrl="item.eltm1.data.MinAppUrl || ''" @click="tplGoToPage"
+        v-if="item.eltmType == 1" :class="{
+          boxFlexItem1: item.flexNum == 1,
+          boxFlexItem2: item.flexNum == 2,
+          boxFlexItem3: item.flexNum == 3,
+          boxFlexItem4: item.flexNum == 4,
+          boxFlexItem5: item.flexNum == 5,
+          ms: 1 == 1,
+          s1: item.eltm1.layout == 1,
+          s2h: item.eltm1.layout == 2,
+          s2v: item.eltm1.layout == 3,
+          s4h: item.eltm1.layout == 4,
+          s4v: item.eltm1.layout == 5,
+          s8h: item.eltm1.layout == 6,
+          s8v: item.eltm1.layout == 7,
+          s16: item.eltm1.layout == 8,
+          s250h: item.eltm1.layout == 9,
+          fl: item.eltm1.align == 1,
+          fr: item.eltm1.align == 2,
+          borderStyle: item.eltm1.border,
+        }" :style="{
+          width: item.eltm1.width + 'rpx',
+          height: item.eltm1.height + 'rpx',
+          paddingTop: item.eltm1.paddingTop + 'px',
+          paddingRight: item.eltm1.paddingRight + 'px',
+          paddingBottom: item.eltm1.paddingBottom + 'px',
+          paddingLeft: item.eltm1.paddingLeft + 'px',
+          backgroundColor: item.bgColor,
+        }">
+        <image lazy-load mode="scaleToFill" :src="item.eltm1.data.path"></image>
+      </view>
+
+      <view v-if="item.eltmType == 2 && item.eltm2.data.words" class="m-RichText" :style="{
+        padding: item.eltm2.padding + 'px',
+        backgroundColor: item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        clear: 'both',
+      }">
+        <wxParse :content="item.eltm2.data.words" />
+      </view>
+
+      <view v-if="item.eltmType == 3" style="position: relative"
+        :class="{ fl: item.eltm3.align == 1, fr: item.eltm3.align == 2 }">
+        <view v-if="
+          item.eltmType == 3 &&
+          i < 3 &&
+          (item.eltm3.showNbg || item.eltm3.showNbg != 0)
+        " :class="item.eltm3.showNbg ? 'bg-ellipse' : ''" :style="{
+          backgroundColor: PageNav.window.navigationBarBackgroundColor,
+        }"></view>
+        <swiper v-if="item.eltmType == 3" class="m-scrollBox" :style="{
+          width: item.eltm3.width * 2 + 'rpx',
+          height: item.eltm3.height * 2 + 'rpx',
+          'background-color': item.bgColor,
+          clear: 'both',
+        }" :indicator-dots="item.eltm3.progress" :indicator-color="item.eltm3.color"
+          :indicator-active-color="item.eltm3.activeColor" :autoplay="item.eltm3.autoplay">
+          <swiper-item v-for="(sitem, si) in item.eltm3.data" :key="si">
+            <view :data-id="sitem.did" :data-name="sitem.name" :data-type="sitem.selectType"
+              :data-keyword="sitem.keyWord || ''" :data-appid="sitem.AppId || ''" :data-appurl="sitem.AppUrl"
+              :data-MinAppUrl="sitem.MinAppUrl || ''" @click="tplGoToPage">
+              <image lazy-load mode="heightFix" :style="{
+                width: item.eltm3.width * 2 + 'rpx',
+                height: item.eltm3.height * 2 + 'rpx',
+                borderRadius: item.eltm3.borderRadius + 'px',
+              }" :src="sitem.path"></image>
             </view>
-            <!--第一个模板-->
-            <!--第二个模板-->
-            <view v-if="(item.eltmType==2 && item.eltm2.data.words)" class="m-RichText" :style="{padding:(item.eltm2.padding)+'px',backgroundColor:(item.bgColor), borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden', clear: 'both'}">
-                <wxParse :content="item.eltm2.data.words" />
-            </view>
-            <!--第二个模板-->
-            <!--第三个模板-->
-            <view v-if="(item.eltmType==3)" style="position: relative;" :class="{fl:item.eltm3.align==1,fr:item.eltm3.align==2}">
-                <view v-if="(item.eltmType==3) && i<3 && (item.eltm3.showNbg || item.eltm3.showNbg!=0)" :class="item.eltm3.showNbg ? 'bg-ellipse' : ''" :style="{backgroundColor: PageNav.window.navigationBarBackgroundColor}"></view>
-                <swiper v-if="(item.eltmType==3)" class="m-scrollBox" :style="{width:(item.eltm3.width*2)+'rpx', height:(item.eltm3.height*2)+'rpx', 'background-color':(item.bgColor), clear: 'both'}"
-                        :indicator-dots="item.eltm3.progress"  :indicator-color="item.eltm3.color" :indicator-active-color="item.eltm3.activeColor"  :autoplay="item.eltm3.autoplay">
+          </swiper-item>
+        </swiper>
+      </view>
 
-                    <swiper-item v-for="(sitem, si) in item.eltm3.data" :key="si">
-                        <view :data-id="(sitem.did)" :data-name="(sitem.name)" :data-type="(sitem.selectType)" :data-keyword="(sitem.keyWord || '')"
-                              :data-appid="(sitem.AppId || '')" :data-appurl="(sitem.AppUrl)" :data-MinAppUrl="(sitem.MinAppUrl || '')" @click="tplGoToPage">
-                            <image lazy-load mode="heightFix" :style="{width:(item.eltm3.width*2)+'rpx', height:(item.eltm3.height*2)+'rpx', borderRadius: item.eltm3.borderRadius+ 'px'}" :src="(sitem.path)"></image>
-                        </view>
-                    </swiper-item>
-                </swiper>
-            </view>
-            <!--第三个模板-->
+      <scroll-view v-if="item.eltmType == 4" :scroll-y="item.eltm4.listTyle != 5" :scroll-x="item.eltm4.listTyle == 5"
+        :style="{
+          backgroundColor: item.bgColor,
+          borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+          borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+          borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+          borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+          overflow: 'hidden',
+          clear: 'both',
+        }">
+        <view v-if="item.eltmType == 4" :class="{
+          m_plist: 1,
+          p1: item.eltm4.listTyle == 1,
+          p2: item.eltm4.listTyle == 2,
+          p3: item.eltm4.listTyle == 3,
+          p4: item.eltm4.listTyle == 4,
+          p5: item.eltm4.listTyle == 5,
+        }">
+          <view class="m_pitem" v-for="(items, ii) in item.eltm4.data" v-show="items" :key="ii" :data-id="items.did"
+            :data-name="items.name" :data-type="items.selectType" :data-keyword="items.keyWord || ''"
+            :data-appid="items.AppId || ''" :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl || ''"
+            @click="tplGoToPage">
+            <view class="m_pinfo">
+              <view class="pimg" v-if="item.eltm4.listTyle != 5">
+                <image lazy-load mode="widthFix" style="width: 100%; height: 100%" :src="$.img(items.path, 360, 360)">
+                </image>
+              </view>
+              <view class="pimg" v-else>
+                <image lazy-load mode="heightFix" :src="$.img(items.path, 360, 360)"></image>
+              </view>
 
-
-            <!--第四个模板-->
-            <scroll-view v-if="(item.eltmType==4)" :scroll-y="item.eltm4.listTyle!=5" :scroll-x="item.eltm4.listTyle==5" :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden', clear: 'both'}">
-
-                <view v-if="(item.eltmType==4)" :class="{m_plist:1, p1:item.eltm4.listTyle==1, p2:item.eltm4.listTyle==2, p3:item.eltm4.listTyle==3, p4:item.eltm4.listTyle==4, p5:item.eltm4.listTyle==5}">
-                    <view class="m_pitem" v-for="(items, ii) in item.eltm4.data" v-show="items" :key="ii" :data-id="(items.did)" :data-name="(items.name)"
-                          :data-type="(items.selectType)" :data-keyword="(items.keyWord || '')" :data-appid="(items.AppId || '')" :data-appurl="(items.AppUrl)"
-                          :data-MinAppUrl="(item.MinAppUrl || '')" @click="tplGoToPage">
-                        <view class="m_pinfo">
-                            <view class="pimg" v-if="item.eltm4.listTyle!=5">
-                                <image lazy-load mode="widthFix" style="width:100%;height:100%" :src="($.img(items.path, 360,  360))"></image>
-                            </view>
-                            <view class="pimg" v-else>
-                                <image lazy-load mode="heightFix" :src="($.img(items.path, 360,  360))"></image>
-                            </view>
-
-                            <view class="pinfo">
-
-                                <view class="pname">
-                                    <label  :style="{height:'unset !important','line-clamp':item.eltm4.charLine}">{{items.name}}</label>
-                                </view>
-
-                                <view class="pSelling"
-                                      v-if="items.ProductTips!='' && item.eltm4.isProductTips"
-                                      :style="item.eltm4.isPrice?'':'display: inline-block; padding-top: 24rpx;padding-bottom: 24rpx'">
-                                    {{items.ProductTips||''}}
-                                </view>
-
-                                <view class="pprice" v-if="item.eltm4.isPrice" :style="{color:item.eltm4.priceColor}">
-
-                                    <view class="pc" :style="{color:item.eltm4.priceColor}">
-                                        <block v-if="item.eltm4.isPrice"><label>{{__('￥')}}</label>{{items.ItemSalePrice}}
-                                        </block>
-                                    </view>
-
-                                    <block v-if="items.item_unit_points">
-                                        <label style="margin: 0rpx 10rpx;">+</label><label style="font-size:32rpx">{{items.item_unit_points}}</label> <label>{{__('积分')}}</label>
-                                    </block>
-
-                                    <block v-if="items.item_unit_sp">
-                                        <label style="margin: 0rpx 10rpx;">+</label><label style="font-size:32rpx">{{items.item_unit_sp}}</label> <label>{{__('众宝')}}</label>
-                                    </block>
-
-
-                                    <view v-if="(item.eltm4.btnType==4)" class="c4" :style="{backgroundColor:(item.eltm4.btnColor),color:(item.eltm4.btnFontColor)}">
-                                        <label v-if="(item.eltm4.btnType==4)">{{item.eltm4.btnText}}</label>
-                                    </view>
-                                    <view v-else :class="'c'+(item.eltm4.btnType)" @click.stop="addCart(items)">
-                                        <label v-if="(item.eltm4.btnType==3)">buy</label>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                    </view>
+              <view class="pinfo">
+                <view class="pname">
+                  <label :style="{
+                    height: 'unset !important',
+                    'line-clamp': item.eltm4.charLine,
+                  }">{{ items.name }}</label>
                 </view>
-            </scroll-view>
-            <!--第四个模板-->
 
-            <!--第五个模板-->
-            <view v-if="(item.eltmType==5)" class="m-blank" :style="{height:(item.eltm5.height)+'px','line-height':(item.eltm5.height)+'px','background-color':(item.bgColor)}">
-            </view>
-            <!--第五个模板-->
-
-            <!--第六个模板-->
-            <scroll-view scroll-x v-if="item.eltmType==6" style='clear:both'>
-                <view v-if="(item.eltmType==6)" :class="{boxFlex:1 ,fdRow:item.eltm6.flexDirection==0, fdRowReverse:item.eltm6.flexDirection==1, fdColumn:item.eltm6.flexDirection==2, fdColumnReverse:item.eltm6.flexDirection==3, fwNowrap:item.eltm6.flexWrap==0,fwWrap:item.eltm6.flexWrap==1,fwWrapReverse:item.eltm6.flexWrap==2,jcFlexStart:item.eltm6.justifyContent==0,jcFlexEnd:item.eltm6.justifyContent==1,jcCenter:item.eltm6.justifyContent==2,jcSpaceBetween:item.eltm6.justifyContent==3,jcSpaceAround:item.eltm6.justifyContent==4,aiFlexStart:item.eltm6.alignItems==0,aiFlexEnd:item.eltm6.alignItems==1,aiCenter:item.eltm6.alignItems==2,aiBaseline:item.eltm6.alignItems==3,aiStretch:item.eltm6.alignItems==4}"
-                      :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}">
-                    <view v-for="(items, ii) in item.eltm6.data" :key="ii" :data-id="(items.did)" :data-name="(items.name)" :data-type="(items.selectType)"
-                          :data-keyword="(items.keyWord || '')" :data-appid="(items.AppId || '')" :data-appurl="(items.AppUrl)" :data-MinAppUrl="(item.MinAppUrl || '')"
-                          @click="tplGoToPage" class="boxFlexItem1" :style="{paddingTop:(item.eltm6.paddingTop)+'px',paddingBottom:(item.eltm6.paddingBottom)+'px',paddingLeft:(item.eltm6.paddingLeft)+'px',paddingRight:(item.eltm6.paddingRight)+'px',fontSize:(item.eltm6.fontSize)+'px',color:(item.eltm6.fontColor)}">
-                        <view v-if="(item.eltm6.type==1)">{{items.name}}</view>
-                        <image lazy-load mode="widthFix" v-if="(item.eltm6.type==0)" :src="(items.path)" class="img" :style="{width:(items.flexNum>1?(items.flexNum+'px'):((w - item.eltm6.paddingLeft - item.eltm6.paddingRight) + 'px')), width:'100%',height:(item.eltm6.height)+'px'}"></image>
-                    </view>
+                <view class="pSelling" v-if="items.ProductTips != '' && item.eltm4.isProductTips" :style="item.eltm4.isPrice
+                  ? ''
+                  : 'display: inline-block; padding-top: 24rpx;padding-bottom: 24rpx'
+                  ">
+                  {{ items.ProductTips || "" }}
                 </view>
-            </scroll-view>
-            <!--第六个模板-->
 
+                <view class="pprice" v-if="item.eltm4.isPrice" :style="{ color: item.eltm4.priceColor }">
+                  <view class="pc" :style="{ color: item.eltm4.priceColor }">
+                    <block v-if="item.eltm4.isPrice"><label>{{ __("￥") }}</label>{{ items.ItemSalePrice }}
+                    </block>
+                  </view>
 
-            <!--第七个模版-->
-            <view v-if="(item.eltmType==7) && item.eltm7.data.length>0" :class="{boxGrids:1, boxGridsBorder:item.eltm7.border }" :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}">
-                <view :class="{boxGrid:1, boxGridBorder:item.eltm7.border}" v-if="(item.eltmType==7) && item.eltm7.data.length/item.eltm7.column <= 2"" v-for="(items, ii) in item.eltm7.data"
-                :key="ii" :style="{width:((100/item.eltm7.column))+'%','padding-top':(item.eltm7.paddingTop)+'px','padding-bottom':(item.eltm7.paddingBottom)+'px','padding-left':(item.eltm7.paddingLeft)+'px','padding-right':(item.eltm7.paddingRight)+'px','background-color':(item.bgColor)}"
-                :data-id="(items.did)" :data-name="(items.name)" :data-mobile="(items.mobile)" :data-type="(items.selectType)" :data-keyword="(items.keyWord || '')"
-                :data-appid="(items.AppId || '')" :data-appurl="(items.AppUrl)" :data-MinAppUrl="(item.MinAppUrl || '')" @click="tplGoToPage">
+                  <block v-if="items.item_unit_points">
+                    <label style="margin: 0rpx 10rpx">+</label><label style="font-size: 32rpx">{{
+                      items.item_unit_points
+                    }}</label>
+                    <label>{{ __("积分") }}</label>
+                  </block>
+
+                  <block v-if="items.item_unit_sp">
+                    <label style="margin: 0rpx 10rpx">+</label><label style="font-size: 32rpx">{{
+                      items.item_unit_sp
+                    }}</label>
+                    <label>{{ __("众宝") }}</label>
+                  </block>
+
+                  <view v-if="item.eltm4.btnType == 4" class="c4"  @click.stop="addCart(items)" :style="{
+                    backgroundColor: item.eltm4.btnColor,
+                    color: item.eltm4.btnFontColor,
+                  }">
+                    <label v-if="item.eltm4.btnType == 4">{{ item.eltm4.btnText }}</label>
+                  </view>
+                  <view v-else :class="'c' + item.eltm4.btnType" @click.stop="addCart(items)">
+                    <label v-if="item.eltm4.btnType == 3">buy</label>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+
+      <view v-if="item.eltmType == 5" class="m-blank" :style="{
+        height: item.eltm5.height + 'px',
+        'line-height': item.eltm5.height + 'px',
+        'background-color': item.bgColor,
+      }">
+      </view>
+
+      <scroll-view scroll-x v-if="item.eltmType == 6" style="clear: both">
+        <view v-if="item.eltmType == 6" :class="{
+          boxFlex: 1,
+          fdRow: item.eltm6.flexDirection == 0,
+          fdRowReverse: item.eltm6.flexDirection == 1,
+          fdColumn: item.eltm6.flexDirection == 2,
+          fdColumnReverse: item.eltm6.flexDirection == 3,
+          fwNowrap: item.eltm6.flexWrap == 0,
+          fwWrap: item.eltm6.flexWrap == 1,
+          fwWrapReverse: item.eltm6.flexWrap == 2,
+          jcFlexStart: item.eltm6.justifyContent == 0,
+          jcFlexEnd: item.eltm6.justifyContent == 1,
+          jcCenter: item.eltm6.justifyContent == 2,
+          jcSpaceBetween: item.eltm6.justifyContent == 3,
+          jcSpaceAround: item.eltm6.justifyContent == 4,
+          aiFlexStart: item.eltm6.alignItems == 0,
+          aiFlexEnd: item.eltm6.alignItems == 1,
+          aiCenter: item.eltm6.alignItems == 2,
+          aiBaseline: item.eltm6.alignItems == 3,
+          aiStretch: item.eltm6.alignItems == 4,
+        }" :style="{
+          backgroundColor: item.bgColor,
+          borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+          borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+          borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+          borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+          overflow: 'hidden',
+        }">
+          <view v-for="(items, ii) in item.eltm6.data" :key="ii" :data-id="items.did" :data-name="items.name"
+            :data-type="items.selectType" :data-keyword="items.keyWord || ''" :data-appid="items.AppId || ''"
+            :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl || ''" @click="tplGoToPage" class="boxFlexItem1"
+            :style="{
+              paddingTop: item.eltm6.paddingTop + 'px',
+              paddingBottom: item.eltm6.paddingBottom + 'px',
+              paddingLeft: item.eltm6.paddingLeft + 'px',
+              paddingRight: item.eltm6.paddingRight + 'px',
+              fontSize: item.eltm6.fontSize + 'px',
+              color: item.eltm6.fontColor,
+            }">
+            <view v-if="item.eltm6.type == 1">{{ items.name }}</view>
+            <image lazy-load mode="widthFix" v-if="item.eltm6.type == 0" :src="items.path" class="img" :style="{
+              width:
+                items.flexNum > 1
+                  ? items.flexNum + 'px'
+                  : w -
+                  item.eltm6.paddingLeft -
+                  item.eltm6.paddingRight +
+                  'px',
+              width: '100%',
+              height: item.eltm6.height + 'px',
+            }"></image>
+          </view>
+        </view>
+      </scroll-view>
+
+      <view v-if="item.eltmType == 7 && item.eltm7.data.length > 0"
+        :class="{ boxGrids: 1, boxGridsBorder: item.eltm7.border }" :style="{
+          backgroundColor: item.bgColor,
+          borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+          borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+          borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+          borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+          overflow: 'hidden',
+        }">
+        <view :class="{ boxGrid: 1, boxGridBorder: item.eltm7.border }" v-if="(item.eltmType == 7) && item.eltm7.data.length / item.eltm7.column <=
+          2"" v-for="(items, ii) in item.eltm7.data" :key="ii"
+          :style="{ width: ((100 / item.eltm7.column)) + '%', 'padding-top': (item.eltm7.paddingTop) + 'px', 'padding-bottom': (item.eltm7.paddingBottom) + 'px', 'padding-left': (item.eltm7.paddingLeft) + 'px', 'padding-right': (item.eltm7.paddingRight) + 'px', 'background-color': (item.bgColor) }"
+          :data-id="(items.did)" :data-name="(items.name)" :data-mobile="(items.mobile)" :data-type="(items.selectType)"
+          :data-keyword="(items.keyWord || '')" :data-appid="(items.AppId || '')" :data-appurl="(items.AppUrl)"
+          :data-MinAppUrl="(item.MinAppUrl || '')" @click="tplGoToPage">
+          <view class="boxGridIcon">
+            <image lazy-load :src="items.path"></image>
+          </view>
+          <label class="boxGridLabel">{{ items.name }}</label>
+        </view>
+
+        <swiper v-if="
+          item.eltmType == 7 && item.eltm7.data.length / item.eltm7.column > 2
+        " class="m-scrollBox" :class="{ boxGrids: 1, boxGridsBorder: item.eltm7.border }" :indicator-dots="true"
+          :autoplay="false" :style="{
+            height: '340rpx',
+            backgroundColor: item.bgColor,
+            borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+            borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+            borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+            borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+            overflow: 'hidden',
+          }">
+          <block v-for="(bitems, bi) in item.eltm7.data" :key="bi">
+            <swiper-item v-if="bi % (item.eltm7.column * 2) == 0">
+              <view :class="{ boxGrid: 1, boxGridBorder: item.eltm7.border }"
+                v-if="ii >= bi && ii < bi + item.eltm7.column * 2" v-for="(items, ii) in item.eltm7.data" :key="ii"
+                :style="{
+                  width: 100 / item.eltm7.column + '%',
+                  'padding-top': item.eltm7.paddingTop + 'px',
+                  'padding-bottom': item.eltm7.paddingBottom + 'px',
+                  'padding-left': item.eltm7.paddingLeft + 'px',
+                  'padding-right': item.eltm7.paddingRight + 'px',
+                  'background-color': item.bgColor,
+                }" :data-id="items.did" :data-name="items.name" :data-mobile="items.mobile"
+                :data-type="items.selectType" :data-keyword="items.keyWord || ''" :data-appid="items.AppId || ''"
+                :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl || ''" @click="tplGoToPage">
                 <view class="boxGridIcon">
-                    <image lazy-load :src="(items.path)"></image>
+                  <image lazy-load :src="items.path"></image>
                 </view>
-                <label class="boxGridLabel">{{items.name}}</label>
-            </view>
+                <label class="boxGridLabel">{{ items.name }}</label>
+              </view>
+            </swiper-item>
+          </block>
+        </swiper>
+      </view>
 
-            <swiper v-if="(item.eltmType==7) && item.eltm7.data.length/item.eltm7.column > 2" class="m-scrollBox"  :class="{boxGrids:1, boxGridsBorder:item.eltm7.border }"  :indicator-dots="true" :autoplay="false" :style="{height: '340rpx', backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}">
-                <block v-for="(bitems, bi) in item.eltm7.data" :key="bi">
-                    <swiper-item v-if="(bi%(item.eltm7.column*2)==0)">
-                        <view :class="{boxGrid:1, boxGridBorder:item.eltm7.border}" v-if="ii >= bi  && ii < (bi+item.eltm7.column*2)" v-for="(items, ii) in item.eltm7.data"
-                              :key="ii" :style="{width:((100/item.eltm7.column))+'%','padding-top':(item.eltm7.paddingTop)+'px','padding-bottom':(item.eltm7.paddingBottom)+'px','padding-left':(item.eltm7.paddingLeft)+'px','padding-right':(item.eltm7.paddingRight)+'px','background-color':(item.bgColor)}"
-                              :data-id="(items.did)" :data-name="(items.name)" :data-mobile="(items.mobile)" :data-type="(items.selectType)" :data-keyword="(items.keyWord || '')"
-                              :data-appid="(items.AppId || '')" :data-appurl="(items.AppUrl)" :data-MinAppUrl="(item.MinAppUrl || '')" @click="tplGoToPage">
-                            <view class="boxGridIcon">
-                                <image lazy-load :src="(items.path)"></image>
-                            </view>
-                            <label class="boxGridLabel">{{items.name}}</label>
-                        </view>
-                    </swiper-item>
+      <view v-if="item.eltmType == 8" class="mTel" :style="{ 'background-color': item.bgColor }"
+        :data-tel="item.eltm8.tel" @tap="callTel">
+        <label class="iconfont icon-dianhua--copy"
+          :style="{ 'font-size': '30px', color: item.eltm8.fontColor }"></label>
+      </view>
 
-                </block>
-            </swiper>
+      <navigator url="/pagesub/search/search" class="u-search-box" v-if="item.eltmType == 9" :style="{
+        'background-color': item.bgColor,
+        'padding-top': item.eltm9.paddingTop + 'px',
+        'padding-bottom': item.eltm9.paddingBottom + 'px',
+        'padding-left': item.eltm9.paddingLeft + 'px',
+        'padding-right': item.eltm9.paddingRight + 'px',
+      }">
+        <view class="u-search-cont">
+          <uni-icons type="search" size="22" color="#666666" />
+          <text>{{ item.eltm9.tipText }}</text>
         </view>
-        <!--第七个模版-->
+      </navigator>
 
-
-        <!--第八个模版-->
-        <view v-if="(item.eltmType==8)" class="mTel" :style="{'background-color':(item.bgColor)}" :data-tel="(item.eltm8.tel)" @tap="callTel">
-            <label class="iconfont icon-dianhua--copy" :style="{'font-size':'30px',color:(item.eltm8.fontColor)}"></label>
+      <uni-nav-bar v-if="item.eltmType == 9 && false" :statusBar="false" :fixed="true" color="#333333"
+        :backgroundColor="BgConfig.BackgroundObj.bgColor" background-color="#ffffff" right-icon="scan"
+        @click-left="showCity" @click-right="scan">
+        <block slot="left">
+          <view class="city">
+            <view>{{ city }}</view>
+            <uni-icons type="arrowdown" color="#333333" size="22" />
+          </view>
+        </block>
+        <view class="input-view">
+          <uni-icons type="search" size="22" color="#666666" />
+          <input confirm-type="search" class="input" type="text" :placeholder="__('输入搜索关键词')" @click="onSearch" />
         </view>
-        <!--第八个模版-->
-        <!--第九个模版-->
-        <navigator url="/pagesub/search/search" class="u-search-box" v-if="(item.eltmType==9)" :style="{'background-color':(item.bgColor),'padding-top':(item.eltm9.paddingTop)+'px','padding-bottom':(item.eltm9.paddingBottom)+'px','padding-left':(item.eltm9.paddingLeft)+'px','padding-right':(item.eltm9.paddingRight)+'px'}">
-            <view class="u-search-cont">
-                <uni-icons type="search" size="22" color="#666666" />
-                <text>{{item.eltm9.tipText}}</text>
-            </view>
-        </navigator>
+      </uni-nav-bar>
 
-        <uni-nav-bar v-if="(item.eltmType==9 && false)" :statusBar="false" :fixed="true" color="#333333" :backgroundColor="BgConfig.BackgroundObj.bgColor" background-color="#ffffff" right-icon="scan" @click-left="showCity" @click-right="scan">
-            <block slot="left">
-                <view class="city">
-                    <view>{{ city }}</view>
-                    <uni-icons type="arrowdown" color="#333333" size="22" />
-                </view>
-            </block>
-            <view class="input-view">
-                <uni-icons type="search" size="22" color="#666666" />
-                <input confirm-type="search" class="input" type="text" :placeholder="__('输入搜索关键词')" @click="onSearch">
-            </view>
-        </uni-nav-bar>
-
-        <!--第九个模版-->
-        <!--第十一个模版-->
-		<movable-area class="movableAreaIM" v-if="(item.eltmType==11 && hasLogin && chatUrl)" >
-			<movable-view class="movableView" @touchmove.stop.prevent="doNothing" direction="all" :x="initX" :y="initY">
-        <view class="mCS" :style="{'background-color':(item.bgColor), borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}">
+      <movable-area class="movableAreaIM" v-if="item.eltmType == 11 && hasLogin && chatUrl">
+        <movable-view class="movableView" @touchmove.stop.prevent="doNothing" direction="all" :x="initX" :y="initY">
+          <view class="mCS" :style="{
+            'background-color': item.bgColor,
+            borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+            borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+            borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+            borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+            overflow: 'hidden',
+          }">
             <!-- #ifdef MP-WEIXIN&&false -->
-            <label class="iconfont icon-more" :style="{'font-size':'30px',color:(item.eltm11.fontColor)}"></label>
+            <label class="iconfont icon-more" :style="{ 'font-size': '30px', color: item.eltm11.fontColor }"></label>
             <contact-button size="27" type="default-dark" session-from="weapp"></contact-button>
             <!-- #endif -->
 
-            <view class="m-footer-btn-item" v-if="chatUrl" data-name="管理员"  data-keyword="" data-appid="0" :data-appurl="(chatUrl)" :data-type="99" @click="tplGoToPage" style="line-height: 96rpx;">
-                <label class="iconfont icon-more" :style="{'font-size':'30px',color:(item.eltm11.fontColor)}"></label>
+            <view class="m-footer-btn-item" v-if="chatUrl" data-name="管理员" data-keyword="" data-appid="0"
+              :data-appurl="chatUrl" :data-type="99" @click="tplGoToPage" style="line-height: 96rpx">
+              <label class="iconfont icon-more" :style="{ 'font-size': '30px', color: item.eltm11.fontColor }"></label>
             </view>
+          </view>
+        </movable-view>
+      </movable-area>
+
+      <view v-if="item.eltmType == 12" :style="{
+        'background-color': item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        'padding-top': item.eltm12.paddingTop + 'px',
+        'padding-bottom': item.eltm12.paddingBottom + 'px',
+        'padding-left': item.eltm12.paddingLeft + 'px',
+        'padding-right': item.eltm12.paddingRight + 'px',
+      }">
+        <!-- #ifdef H5 -->
+        <video :poster="item.eltm12.poster" :src="item.eltm12.src" :controls="item.eltm12.controls"
+          :loop="item.eltm12.loop" :style="{
+            width: item.eltm12.width * 2 + 'rpx',
+            height: item.eltm12.height * 2 + 'rpx',
+            'background-color': item.bgColor,
+          }" objectFit="fill"></video>
+        <!-- #endif -->
+
+        <!-- #ifndef H5 -->
+        <video :poster="item.eltm12.poster" :src="item.eltm12.src" :controls="item.eltm12.controls"
+          :autoplay="item.eltm12.autoplay" :loop="item.eltm12.loop" :style="{
+            width: item.eltm12.width * 2 + 'rpx',
+            height: item.eltm12.height * 2 + 'rpx',
+            'background-color': item.bgColor,
+          }" objectFit="fill" v-if="!hideDiy"></video>
+        <!-- #endif -->
+      </view>
+
+      <form class="formBox" @submit="formSubmit" @reset="formReset" v-if="item.eltmType == 13" :style="{
+        backgroundColor: item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        clear: 'both',
+      }">
+        <view v-for="(items, idx) in item.eltm13.data" :key="idx">
+          <view class="fromInput" v-if="items.type == 1"><label :style="{ color: item.eltm13.labelColor }">{{
+            items.labelText
+              }}</label><input type="text" :name="'' + items.id" maxlength="200" :placeholder="items.placeholderText"
+              :style="{
+                borderColor: items.borderColor,
+                color: item.eltm13.textColor,
+              }" /></view>
+          <view class="fromInput" v-if="items.type == 2"><label :style="{ color: item.eltm13.labelColor }">{{
+            items.labelText
+              }}</label>
+            <picker mode="date" :value="items.name" :data-id="items.id" @change="bindDateChange">
+              <view class="picker">{{ items.name || __("请选择时间") }} </view>
+            </picker>
+          </view>
+          <view class="fromInput" v-if="items.type == 3"><label :style="{ color: item.eltm13.labelColor }">{{
+            items.labelText
+              }}</label><textarea :name="'' + items.id" maxlength="400" :placeholder="items.placeholderText" :style="{
+                borderColor: items.borderColor,
+                color: item.eltm13.textColor,
+              }"></textarea>
+          </view>
+          <radio-group :name="'' + items.id" class="fromInput" v-if="items.type == 4"><label
+              :style="{ color: item.eltm13.labelColor }">{{
+                items.labelText
+              }}</label>
+            <view class="fromCK_item" v-for="(info, idx) in items.data" :key="idx">
+              <radio :color="items.selColor" :value="info.text" />
+              <text :style="{ color: item.eltm13.textColor }">{{
+                info.text
+              }}</text>
+            </view>
+          </radio-group>
+          <checkbox-group :name="'' + items.id" class="fromInput" v-if="items.type == 5"><label
+              :style="{ color: item.eltm13.labelColor }">{{
+                items.labelText
+              }}</label>
+            <view class="fromCK_item" v-for="(info, idx) in items.data" :key="idx">
+              <checkbox :color="items.selColor" :value="info.text" />
+              <text :style="{ color: item.eltm13.textColor }">{{
+                info.text
+              }}</text>
+            </view>
+          </checkbox-group>
+          <view class="fromInput" v-if="items.type == 6"><label :style="{ color: item.eltm13.labelColor }">{{
+            items.labelText
+              }}</label>
+            <view class="upload-view">
+              <view v-for="(info, idx) in items.data" :key="idx" class="upload-img-item">
+                <image mode="aspectFit" :src="info"></image>
+                <view class="del-upload-img" :data-id="items.id" :data-index="idx" @click.stop="delUploadImg"><label
+                    class="iconfont icon-delete"></label></view>
+              </view>
+              <view class="upload-img" v-if="items.data.length < items.moreNum" :data-id="items.id"
+                :data-num="items.moreNum" @tap="formUploadImage"></view>
+            </view>
+          </view>
         </view>
-		    </movable-view>
-		</movable-area>
-        <!--第十一个模版-->
-        <!--第十二个模版-->
-        <view v-if="(item.eltmType==12)" :style="{'background-color':(item.bgColor), borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden','padding-top':(item.eltm12.paddingTop)+'px','padding-bottom':(item.eltm12.paddingBottom)+'px','padding-left':(item.eltm12.paddingLeft)+'px','padding-right':(item.eltm12.paddingRight)+'px'}">
-
-            <!-- #ifdef H5 -->
-            <video :poster="item.eltm12.poster" :src="(item.eltm12.src)" :controls="(item.eltm12.controls)" :loop="(item.eltm12.loop)" :style="{width:(item.eltm12.width*2)+'rpx',height:(item.eltm12.height*2)+'rpx', 'background-color':(item.bgColor)}" objectFit="fill">
-            </video>
-            <!-- #endif -->
-
-            <!-- #ifndef H5 -->
-            <video :poster="item.eltm12.poster" :src="(item.eltm12.src)" :controls="(item.eltm12.controls)" :autoplay="(item.eltm12.autoplay)" :loop="(item.eltm12.loop)" :style="{width:(item.eltm12.width*2)+'rpx',height:(item.eltm12.height*2)+'rpx', 'background-color':(item.bgColor)}" objectFit="fill" v-if="!hideDiy">
-            </video>
-            <!-- #endif -->
+        <view class="formSubmit">
+          <button class="formButtom" formType="submit" :style="{
+            backgroundColor: item.eltm13.btnColor,
+            color: item.eltm13.fontColor,
+          }">
+            {{ item.eltm13.btnText }}
+          </button>
         </view>
-        <!--第十二个模版-->
+      </form>
 
+      <view v-if="item.eltmType == 14" class="notice" :style="{
+        'background-color': item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        'padding-top': item.eltm14.paddingTop * 2 + 'rpx',
+        'padding-bottom': item.eltm14.paddingBottom * 2 + 'rpx',
+        clear: 'both',
+      }">
+        <view class="notice-icon">
+          <image :src="item.eltm14.image
+            ? item.eltm14.image
+            : 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/notice/Notice1.png'
+            "></image>
+        </view>
+        <swiper autoplay :vertical="item.eltm14.scrollDir == 0 ? true : false" circular class="notice-content">
+          <swiper-item v-for="(items, idx) in item.eltm14.data" :key="idx" :data-id="items.did" :data-name="items.name"
+            :data-type="items.selectType" :data-keyword="items.keyWord || ''" :data-appid="items.AppId || ''"
+            :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl || ''" @tap="tplGoToPage"><label
+              :style="{ color: item.eltm14.fontColor }">{{
+                items.name
+              }}</label></swiper-item>
+        </swiper>
+        <view class="notice-arrow" :style="{ color: item.eltm14.arrowColor }"><label
+            class="iconfont icon-right"></label></view>
+      </view>
 
+      <view class="head-title" v-if="item.eltmType == 15" :style="{
+        backgroundColor: item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        marginTop: item.eltm15.margin_top * 2 + 'rpx',
+        marginBottom: item.eltm15.margin_bottom * 2 + 'rpx',
+        clear: 'both',
+      }">
+        <image v-if="item.eltm15.isIcon" :src="item.eltm15.icon" mode="aspectFit"></image>
+        <view class="title-label" :style="{ color: item.eltm15.titleColor }">{{
+          item.eltm15.title
+        }}</view>
+        <diy-countdown v-if="item.eltm15.isCountdown" :class="'countdown-box time' + item.eltm15.cssType"
+          :startTime="item.eltm15.startTime" :endTime="item.eltm15.endTime" cttitle="cttitle"
+          time-box="time-box"></diy-countdown>
+        <view v-if="item.eltm15.isLink" :data-id="item.eltm15.data.did" :data-name="item.eltm15.data.name"
+          :data-type="item.eltm15.data.selectType" :data-keyword="item.eltm15.data.keyWord || ''"
+          :data-appid="item.eltm15.data.AppId || ''" :data-appurl="item.eltm15.data.AppUrl"
+          :data-MinAppUrl="item.eltm15.data.MinAppUrl || ''" @tap="tplGoToPage" class="title-linke"
+          :style="{ color: item.eltm15.fontColor, fontSize: '24rpx' }">{{ item.eltm15.linkText }}
+          <label class="uni-icon uni-icon-arrowright"
+            :style="{ color: item.eltm15.arrowColor, fontSize: '30rpx' }"></label>
+        </view>
+      </view>
 
-        <form class="formBox" @submit="formSubmit" @reset="formReset" v-if="item.eltmType==13"
-              :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden', clear: 'both'}">
-            <view v-for="(items, idx) in item.eltm13.data" :key="idx">
-                <view class="fromInput" v-if="items.type==1"><label :style="{color:item.eltm13.labelColor}">{{items.labelText}}</label><input
-                        type='text' :name="''+items.id" maxlength="200" :placeholder="items.placeholderText"
-                        :style='{borderColor:items.borderColor,color:item.eltm13.textColor}'/></view>
-                <view class="fromInput" v-if="items.type==2"><label :style="{color:item.eltm13.labelColor}">{{items.labelText}}</label>
-                    <picker mode="date" :value="items.name" :data-id="items.id" @change="bindDateChange">
-                        <view class="picker">{{items.name||__('请选择时间')}}
-                        </view>
-                    </picker>
+      <view v-if="item.eltmType == 16" :style="{
+        backgroundColor: item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        marginTop: item.eltm16.margin_top * 2 + 'rpx',
+        marginBottom: item.eltm16.margin_bottom * 2 + 'rpx',
+        clear: 'both',
+      }">
+        <scroll-view scroll-x v-if="item.eltm16.layout == 1">
+          <view class="activity-box1">
+            <block v-for="(items, idx) in item.eltm16.data" :key="idx">
+              <navigator v-if="items.selectType != 15" :url="'/pages/product/detail?pid=' + items.did"
+                class="activity-item" :data-Mid="items.mid || ''">
+                <view class="activity-img">
+                  <image :src="items.path" />
+                  <view class="activity-countdown" v-if="item.eltm16.isCountdown" :style="{
+                    backgroundColor: item.eltm16.countdownBgColor,
+                    color: item.eltm16.countdownFontColor,
+                  }">
+                    <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
+                      :showType="1"></diy-countdown>
+                  </view>
+                  <view class="mark" v-if="item.eltm16.isLabel">
+                    <image :src="items.selectType == 12
+                      ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize3.png'
+                      : items.selectType == 13
+                        ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize1.png'
+                        : items.selectType == 14
+                          ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize2.png'
+                          : 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png'
+                      " />
+                  </view>
                 </view>
-                <view class="fromInput" v-if="items.type==3"><label :style="{color:item.eltm13.labelColor}">{{items.labelText}}</label><textarea
-                        :name="''+items.id" maxlength="400" :placeholder="items.placeholderText"
-                        :style="{borderColor:items.borderColor,color:item.eltm13.textColor}"></textarea>
+                <view class="activity-info">
+                  <view class="activity-name" v-if="
+                    item.eltm16.isShowPname == null || item.eltm16.isShowPname
+                  " :style="{
+                    height: item.eltm16.charLine == 1 ? '30rpx' : '64rpx',
+                    '-webkit-line-clamp': item.eltm16.charLine,
+                  }">
+                    {{ items.name }}
+                  </view>
+                  <view class="activity-price" v-if="
+                    item.eltm16.isShowPrice == null || item.eltm16.isShowPrice
+                  "><label class="price" :style="{ color: item.eltm16.priceColor }">{{ __("￥") }}{{ items.ItemSalePrice
+                      }}</label><label class="del-price" v-if="items.selectType == 14">{{ __("￥") }}{{ items.MarketPice
+                      }}</label><label class="tip" v-if="items.selectType == 12 || items.selectType == 13">{{
+                        items.UserLimit }}{{ __("人团") }}</label>
+                  </view>
+                  <view class="activity-desc" v-if="item.eltm16.isShowNum">
+                    {{ __("已有") }}{{ items.OrderCount }} {{ __("人参加") }}
+                  </view>
                 </view>
-                <radio-group :name="''+items.id" class="fromInput" v-if="items.type==4"><label
-                        :style="{color:item.eltm13.labelColor}">{{items.labelText}}</label>
-                    <view class="fromCK_item" v-for="(info, idx) in items.data" :key="idx">
-                        <radio :color="items.selColor" :value='info.text'/>
-                        <text :style="{color:item.eltm13.textColor}">{{info.text}}</text>
-                    </view>
-                </radio-group>
-                <checkbox-group :name="''+items.id" class="fromInput" v-if="items.type==5"><label
-                        :style="{color:item.eltm13.labelColor}">{{items.labelText}}</label>
-                    <view class="fromCK_item" v-for="(info, idx) in items.data" :key="idx">
-                        <checkbox :color="items.selColor" :value='info.text'/>
-                        <text :style="{color:item.eltm13.textColor}">{{info.text}}</text>
-                    </view>
-                </checkbox-group>
-                <view class="fromInput" v-if="items.type==6"><label :style="{color:item.eltm13.labelColor}">{{items.labelText}}</label>
-                    <view class='upload-view'>
-                        <view v-for="(info, idx) in items.data" :key="idx" class='upload-img-item'>
-                            <image mode="aspectFit" :src='info'></image>
-                            <view class='del-upload-img' :data-id="items.id" :data-index='idx'
-                                  @click.stop='delUploadImg'><label class='iconfont icon-delete'></label></view>
-                        </view>
-                        <view class='upload-img' v-if="items.data.length<items.moreNum" :data-id="items.id"
-                              :data-num='items.moreNum' @tap='formUploadImage'></view>
-                    </view>
+              </navigator>
+              <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
+                @click.stop="goCutprice">
+                <view class="activity-img">
+                  <image :src="items.path" />
+                  <view class="activity-countdown" v-if="item.eltm16.isCountdown" :style="{
+                    backgroundColor: item.eltm16.countdownBgColor,
+                    color: item.eltm16.countdownFontColor,
+                  }">
+                    <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
+                      :showType="1"></diy-countdown>
+                  </view>
+                  <view class="mark" v-if="item.eltm16.isLabel">
+                    <image
+                      src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png" />
+                  </view>
                 </view>
-            </view>
-            <view class="formSubmit">
-                <button class="formButtom" formType="submit"
-                        :style="{backgroundColor:item.eltm13.btnColor,color:item.eltm13.fontColor}">
-                    {{item.eltm13.btnText}}
-                </button>
-            </view>
-        </form>
-        <view v-if="item.eltmType==14" class='notice'
-              :style="{'background-color':item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden','padding-top':item.eltm14.paddingTop*2 + 'rpx', 'padding-bottom':item.eltm14.paddingBottom*2 + 'rpx',clear: 'both'}">
-            <view class="notice-icon ">
-                <image :src="item.eltm14.image?item.eltm14.image:'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/notice/Notice1.png'"></image>
-            </view>
-            <swiper autoplay :vertical="item.eltm14.scrollDir==0?true:false" circular class="notice-content">
-                <swiper-item v-for="(items, idx) in item.eltm14.data"  :key="idx"  :data-id="items.did"
-                             :data-name="items.name" :data-type="items.selectType"
-                             :data-keyword="items.keyWord  || ''" :data-appid="items.AppId  || ''"
-                             :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl  || ''"
-                             @tap="tplGoToPage"><label
-                        :style="{color:item.eltm14.fontColor}">{{items.name}}</label></swiper-item>
-            </swiper>
-            <view class="notice-arrow" :style="{color:item.eltm14.arrowColor}"><label
-                    class="iconfont icon-right"></label></view>
-        </view>
-        <view class="head-title" v-if="item.eltmType==15"
-              :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden',marginTop:item.eltm15.margin_top*2+'rpx',marginBottom:item.eltm15.margin_bottom*2+'rpx',clear: 'both'}">
-            <image v-if="item.eltm15.isIcon" :src="item.eltm15.icon" mode="aspectFit"></image>
-            <view class="title-label" :style="{color:item.eltm15.titleColor}">{{item.eltm15.title}}</view>
-            <diy-countdown v-if="item.eltm15.isCountdown" :class="'countdown-box time' + item.eltm15.cssType"
-                           :startTime="item.eltm15.startTime" :endTime="item.eltm15.endTime"
-                           cttitle="cttitle" time-box="time-box"></diy-countdown>
-            <view v-if="item.eltm15.isLink" :data-id="item.eltm15.data.did"
-                  :data-name="item.eltm15.data.name" :data-type="item.eltm15.data.selectType"
-                  :data-keyword="item.eltm15.data.keyWord  || ''" :data-appid="item.eltm15.data.AppId  || ''"
-                  :data-appurl="item.eltm15.data.AppUrl"
-                  :data-MinAppUrl="item.eltm15.data.MinAppUrl  || ''" @tap="tplGoToPage" class="title-linke"
-                  :style="{color:item.eltm15.fontColor, fontSize:'24rpx'}">{{item.eltm15.linkText}}
-                <label class="uni-icon uni-icon-arrowright" :style="{color:item.eltm15.arrowColor, fontSize:'30rpx'}"></label></view>
-        </view>
-
-        <view v-if="item.eltmType==16"
-              :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden',marginTop:item.eltm16.margin_top*2+'rpx',marginBottom:item.eltm16.margin_bottom*2+'rpx',clear: 'both'}">
-            <scroll-view scroll-x v-if="item.eltm16.layout==1">
-                <view class="activity-box1">
-                    <block v-for="(items, idx) in item.eltm16.data" :key="idx">
-                        <navigator v-if="items.selectType!=15"
-                                   :url="'/pages/product/detail?pid='+items.did"
-                                   class="activity-item" :data-Mid="items.mid || ''">
-                            <view class="activity-img">
-                                <image :src="items.path"/>
-                                <view class="activity-countdown" v-if="item.eltm16.isCountdown"
-                                      :style="{backgroundColor:item.eltm16.countdownBgColor,color:item.eltm16.countdownFontColor}">
-                                    <diy-countdown :startTime="items.StartTimeStr"
-                                                   :endTime="items.EndTimeStr" :showType="1"></diy-countdown>
-                                </view>
-                                <view class="mark" v-if="item.eltm16.isLabel">
-                                    <image :src="items.selectType==12?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize3.png':items.selectType==13?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize1.png':items.selectType==14?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize2.png':'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png'"
-                                    />
-                                </view>
-                            </view>
-                            <view class="activity-info">
-                                <view class="activity-name"
-                                      v-if="item.eltm16.isShowPname==null || item.eltm16.isShowPname"
-                                      :style="{height:item.eltm16.charLine==1?'30rpx':'64rpx','-webkit-line-clamp':item.eltm16.charLine}">
-                                    {{items.name}}
-                                </view>
-                                <view class="activity-price"
-                                      v-if="item.eltm16.isShowPrice==null || item.eltm16.isShowPrice"><label
-                                        class="price"
-                                        :style="{color:item.eltm16.priceColor}">{{__('￥')}}{{items.ItemSalePrice}}</label><label
-                                        class="del-price"
-                                        v-if="items.selectType==14">{{__('￥')}}{{items.MarketPice}}</label><label
-                                        class="tip" v-if="items.selectType==12||items.selectType==13">{{items.UserLimit}}{{__('人团')}}</label>
-                                </view>
-                                <view class="activity-desc" v-if="item.eltm16.isShowNum">
-                                    {{__('已有')}}{{items.OrderCount}} {{__('人参加')}}
-                                </view>
-                            </view>
-                        </navigator>
-                        <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
-                                @click.stop='goCutprice'>
-                            <view class="activity-img">
-                                <image :src="items.path"/>
-                                <view class="activity-countdown" v-if="item.eltm16.isCountdown"
-                                      :style="{backgroundColor:item.eltm16.countdownBgColor,color:item.eltm16.countdownFontColor}">
-                                    <diy-countdown :startTime="items.StartTimeStr"
-                                                   :endTime="items.EndTimeStr" :showType="1"></diy-countdown>
-                                </view>
-                                <view class="mark" v-if="item.eltm16.isLabel">
-                                    <image src='https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png'/>
-                                </view>
-                            </view>
-                            <view class="activity-info">
-                                <view class="activity-name"
-                                      v-if="item.eltm16.isShowPname==null || item.eltm16.isShowPname"
-                                      :style="{height:item.eltm16.charLine==1?'30rpx':'64rpx','-webkit-line-clamp':item.eltm16.charLine}">
-                                    {{items.name}}
-                                </view>
-                                <view class="activity-price"
-                                      v-if="item.eltm16.isShowPrice==null || item.eltm16.isShowPrice"><label
-                                        class="price"
-                                        :style="{color:item.eltm16.priceColor}">{{__('￥')}}{{items.ItemSalePrice}}</label>
-                                </view>
-                                <view class="activity-desc" v-if="item.eltm16.isShowNum">
-                                    {{__('已有')}}{{items.OrderCount}} {{__('人参加')}}
-                                </view>
-                            </view>
-                        </button>
-                    </block>
+                <view class="activity-info">
+                  <view class="activity-name" v-if="
+                    item.eltm16.isShowPname == null || item.eltm16.isShowPname
+                  " :style="{
+                    height: item.eltm16.charLine == 1 ? '30rpx' : '64rpx',
+                    '-webkit-line-clamp': item.eltm16.charLine,
+                  }">
+                    {{ items.name }}
+                  </view>
+                  <view class="activity-price" v-if="
+                    item.eltm16.isShowPrice == null || item.eltm16.isShowPrice
+                  "><label class="price" :style="{ color: item.eltm16.priceColor }">{{ __("￥") }}{{ items.ItemSalePrice
+                      }}</label>
+                  </view>
+                  <view class="activity-desc" v-if="item.eltm16.isShowNum">
+                    {{ __("已有") }}{{ items.OrderCount }} {{ __("人参加") }}
+                  </view>
                 </view>
-            </scroll-view>
-            <view v-if="item.eltm16.layout==2" class="activity-box2">
-                <block v-for="(items, idx) in item.eltm16.data" :key="idx">
-                    <navigator v-if="items.selectType!=15"
-                               :url="'/pages/product/detail?pid='+items.did"
-                               class="activity-item" :data-Mid="items.mid || ''">
-                        <view class="activity-img">
-                            <image :src="items.path"/>
-                            <view class="activity-countdown" v-if="item.eltm16.isCountdown"
-                                  :style="{backgroundColor:item.eltm16.countdownBgColor,color:item.eltm16.countdownFontColor}">
-                                <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
-                                               :showType="1"></diy-countdown>
-                            </view>
-                            <view class="mark" v-if="item.eltm16.isLabel">
-                                <image :src="items.selectType==12?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize3.png':items.selectType==13?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize1.png':'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize2.png'"/>
-                            </view>
-                        </view>
-                        <view class="activity-info">
-                            <view class="activity-name"
-                                  v-if="item.eltm16.isShowPname==null || item.eltm16.isShowPname"
-                                  :style="{height:item.eltm16.charLine==1?'30rpx':'64rpx','-webkit-line-clamp':item.eltm16.charLine}">
-                                {{items.name}}
-                            </view>
-                            <view class="activity-price"
-                                  v-if="item.eltm16.isShowPrice==null || item.eltm16.isShowPrice"><label
-                                    class="price"
-                                    :style="{color:item.eltm16.priceColor}">{{__('￥')}}{{items.ItemSalePrice}}</label><label
-                                    class="del-price" v-if="items.selectType==14">{{__('￥')}}{{items.MarketPice}}</label><label
-                                    class="tip" v-if="items.selectType!=14">{{items.UserLimit}}{{__('人团')}}</label>
-                            </view>
-                            <view class="activity-desc" v-if="item.eltm16.isShowNum">{{__('已有')}}{{items.OrderCount}} {{__('人参加')}}
-                            </view>
-                        </view>
-                    </navigator>
-                    <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
-                            @click.stop='goCutprice'>
-                        <view class="activity-img">
-                            <image :src="items.path"/>
-                            <view class="activity-countdown" v-if="item.eltm16.isCountdown"
-                                  :style="{backgroundColor:item.eltm16.countdownBgColor,color:item.eltm16.countdownFontColor}">
-                                <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
-                                               :showType="1"></diy-countdown>
-                            </view>
-                            <view class="mark" v-if="item.eltm16.isLabel">
-                                <image src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png"/>
-                            </view>
-                        </view>
-                        <view class="activity-info">
-                            <view class="activity-name"
-                                  v-if="item.eltm16.isShowPname==null || item.eltm16.isShowPname"
-                                  :style="{height:item.eltm16.charLine==1?'30rpx':'64rpx','-webkit-line-clamp':item.eltm16.charLine}">
-                                {{items.name}}
-                            </view>
-                            <view class="activity-price"
-                                  v-if="item.eltm16.isShowPrice==null || item.eltm16.isShowPrice"><label
-                                    class="price"
-                                    :style="{color:item.eltm16.priceColor}">{{__('￥')}}{{items.ItemSalePrice}}</label></view>
-                            <view class="activity-desc" v-if="item.eltm16.isShowNum">{{__('已有')}}{{items.OrderCount}} {{__('人参加')}}
-                            </view>
-                        </view>
-                    </button>
-                </block>
-            </view>
-            <view v-if="item.eltm16.layout==3" class="activity-box3">
-                <block v-for="(items, idx) in item.eltm16.data" :key="idx">
-                    <navigator v-if="items.selectType!=15"
-                               :url="'/pages/product/detail?pid='+items.did"
-                               class="activity-item" :data-Mid="items.mid || ''">
-                        <view class="activity-img">
-                            <image :src="items.path"/>
-                            <view class="activity-countdown" v-if="item.eltm16.isCountdown"
-                                  :style="{backgroundColor:item.eltm16.countdownBgColor,color:item.eltm16.countdownFontColor}">
-                                <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
-                                               :showType="1"></diy-countdown>
-                            </view>
-                            <view class="mark" v-if="item.eltm16.isLabel">
-                                <image :src="items.selectType==12?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize3.png':items.selectType==13?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize1.png':items.selectType==14?'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize2.png':'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png'"
-                                />
-                            </view>
-                        </view>
-                        <view class="activity-info">
-                            <view class="activity-name"
-                                  v-if="item.eltm16.isShowPname==null || item.eltm16.isShowPname"
-                                  :style="{height:item.eltm16.charLine==1?'30rpx':'64rpx','-webkit-line-clamp':item.eltm16.charLine}">
-                                {{items.name}}
-                            </view>
-                            <view class="activity-desc"><label class="tip"
-                                                               v-if="items.selectType==12||items.selectType==13">{{items.UserLimit}}{{__('人团')}}</label><label
-                                    v-if="item.eltm16.isShowNum">{{__('已有')}}{{items.OrderCount}} {{__('人参加')}}</label></view>
-                            <view class="activity-price"
-                                  v-if="item.eltm16.isShowPrice==null || item.eltm16.isShowPrice"><label
-                                    class="price"
-                                    :style="{color:item.eltm16.priceColor}">{{__('￥')}}{{items.ItemSalePrice}}</label><label
-                                    class="del-price" v-if="items.selectType==14">{{__('￥')}}{{items.MarketPice}}</label>
-                                <view class='activity-btn'
-                                      :style="{backgroundColor:item.eltm16.btnBgColor,color:item.eltm16.btnFontColor}">
-                                    {{items.words||(items.selectType==14?__('去秒杀'):items.selectType==15?__('去砍价'):__('立即开团'))}}
-                                </view>
-                            </view>
-                        </view>
-                    </navigator>
-                    <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
-                            @click.stop='goCutprice'>
-                        <view class="activity-img">
-                            <image :src="items.path"/>
-                            <view class="activity-countdown" v-if="item.eltm16.isCountdown"
-                                  :style="{backgroundColor:item.eltm16.countdownBgColor,color:item.eltm16.countdownFontColor}">
-                                <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
-                                               :showType="1"></diy-countdown>
-                            </view>
-                            <view class="mark" v-if="item.eltm16.isLabel">
-                                <image src='https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png'/>
-                            </view>
-                        </view>
-                        <view class="activity-info">
-                            <view class="activity-name"
-                                  v-if="item.eltm16.isShowPname==null || item.eltm16.isShowPname"
-                                  style="{height:item.eltm16.charLine==1?'30rpx':'64rpx','-webkit-line-clamp':item.eltm16.charLine}">
-                                {{items.name}}
-                            </view>
-                            <view class="activity-desc"><label class="tip"
-                                                               v-if="items.selectType==12||items.selectType==13">{{items.UserLimit}}{{__('人团')}}</label><label
-                                    v-if="item.eltm16.isShowNum">{{__('已有')}}{{items.OrderCount}} {{__('人参加')}}</label></view>
-                            <view class="activity-price"
-                                  v-if="item.eltm16.isShowPrice==null || item.eltm16.isShowPrice"><label
-                                    class="price"
-                                    :style="{color:item.eltm16.priceColor}">{{__('￥')}}{{items.ItemSalePrice}}</label><label
-                                    class="del-price" v-if="items.selectType==14">{{__('￥')}}{{items.MarketPice}}</label>
-                                <view class='activity-btn'
-                                      :style="{backgroundColor:item.eltm16.btnBgColor,color:item.eltm16.btnFontColor}">
-                                    {{items.words||(items.selectType==14?__('去秒杀'):items.selectType==15?__('去砍价'):__('立即开团'))}}
-                                </view>
-                            </view>
-                        </view>
-                    </button>
-                </block>
-            </view>
-        </view>
-        <view v-if="item.eltmType==17" :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden', marginTop:item.eltm17.margin_top*2+'rpx',marginBottom:item.eltm17.margin_bottom*2+'rpx',clear: 'both'}">
-            <scroll-view scroll-x>
-                <view class="coupon_box">
-                    <button class="coupon_item" open-type='getUserInfo' v-if="item.eltmType==17 && item.eltm17.layout==1"
-                            v-for="(items, idx) in item.eltm17.data" :key="idx" :data-id="items.did"
-                            :data-name="items.name" :data-type="items.selectType"
-                            :data-keyword="items.keyWord  || ''"
-                            :data-appid="items.AppId  || ''" :data-appurl="items.AppUrl"
-                            :data-MinAppUrl="item.MinAppUrl  || ''" @tap="tplGoToPage" style="margin:0">
-                        <view class="coupon_price">{{__('￥')}}{{items.ItemSalePrice}}</view>
-                        <view class="coupon_desc">{{items.name || items.ProductTips}}</view>
-                    </button>
-                    <button v-if="item.eltmType==17 && item.eltm17.layout==2" open-type='getUserInfo'
-                            v-for="(items, idx) in item.eltm17.data" :key="idx" class="coupon_img"
-                            :data-id="items.did" :data-name="items.name" :data-type="items.selectType"
-                            :data-keyword="items.keyWord  || ''"
-                            :data-appid="items.AppId  || ''" :data-appurl="items.AppUrl"
-                            :data-MinAppUrl="item.MinAppUrl  || ''" @tap="tplGoToPage" style="margin:0">
-                        <image :src="items.path"></image>
-                    </button>
+              </button>
+            </block>
+          </view>
+        </scroll-view>
+        <view v-if="item.eltm16.layout == 2" class="activity-box2">
+          <block v-for="(items, idx) in item.eltm16.data" :key="idx">
+            <navigator v-if="items.selectType != 15" :url="'/pages/product/detail?pid=' + items.did"
+              class="activity-item" :data-Mid="items.mid || ''">
+              <view class="activity-img">
+                <image :src="items.path" />
+                <view class="activity-countdown" v-if="item.eltm16.isCountdown" :style="{
+                  backgroundColor: item.eltm16.countdownBgColor,
+                  color: item.eltm16.countdownFontColor,
+                }">
+                  <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
+                    :showType="1"></diy-countdown>
                 </view>
-            </scroll-view>
+                <view class="mark" v-if="item.eltm16.isLabel">
+                  <image :src="items.selectType == 12
+                    ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize3.png'
+                    : items.selectType == 13
+                      ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize1.png'
+                      : 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize2.png'
+                    " />
+                </view>
+              </view>
+              <view class="activity-info">
+                <view class="activity-name" v-if="
+                  item.eltm16.isShowPname == null || item.eltm16.isShowPname
+                " :style="{
+                  height: item.eltm16.charLine == 1 ? '30rpx' : '64rpx',
+                  '-webkit-line-clamp': item.eltm16.charLine,
+                }">
+                  {{ items.name }}
+                </view>
+                <view class="activity-price" v-if="
+                  item.eltm16.isShowPrice == null || item.eltm16.isShowPrice
+                "><label class="price" :style="{ color: item.eltm16.priceColor }">{{ __("￥") }}{{ items.ItemSalePrice
+                    }}</label><label class="del-price" v-if="items.selectType == 14">{{ __("￥") }}{{ items.MarketPice
+                    }}</label><label class="tip" v-if="items.selectType != 14">{{ items.UserLimit }}{{ __("人团")
+                    }}</label>
+                </view>
+                <view class="activity-desc" v-if="item.eltm16.isShowNum">{{ __("已有") }}{{ items.OrderCount }} {{
+                  __("人参加") }}
+                </view>
+              </view>
+            </navigator>
+            <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
+              @click.stop="goCutprice">
+              <view class="activity-img">
+                <image :src="items.path" />
+                <view class="activity-countdown" v-if="item.eltm16.isCountdown" :style="{
+                  backgroundColor: item.eltm16.countdownBgColor,
+                  color: item.eltm16.countdownFontColor,
+                }">
+                  <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
+                    :showType="1"></diy-countdown>
+                </view>
+                <view class="mark" v-if="item.eltm16.isLabel">
+                  <image
+                    src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png" />
+                </view>
+              </view>
+              <view class="activity-info">
+                <view class="activity-name" v-if="
+                  item.eltm16.isShowPname == null || item.eltm16.isShowPname
+                " :style="{
+                  height: item.eltm16.charLine == 1 ? '30rpx' : '64rpx',
+                  '-webkit-line-clamp': item.eltm16.charLine,
+                }">
+                  {{ items.name }}
+                </view>
+                <view class="activity-price" v-if="
+                  item.eltm16.isShowPrice == null || item.eltm16.isShowPrice
+                "><label class="price" :style="{ color: item.eltm16.priceColor }">{{ __("￥") }}{{ items.ItemSalePrice
+                    }}</label></view>
+                <view class="activity-desc" v-if="item.eltm16.isShowNum">{{ __("已有") }}{{ items.OrderCount }} {{
+                  __("人参加") }}
+                </view>
+              </view>
+            </button>
+          </block>
         </view>
-        <view class='official-account' v-if="item.eltmType==18"
-              :style="{backgroundColor:item.bgColor,paddingTop:item.eltm18.paddingTop*2+'rpx',paddingBottom:item.eltm18.paddingBottom*2+'rpx',clear: 'both'}">
-            <official-account @error="mpError"  @load="mpLoad"></official-account>
+        <view v-if="item.eltm16.layout == 3" class="activity-box3">
+          <block v-for="(items, idx) in item.eltm16.data" :key="idx">
+            <navigator v-if="items.selectType != 15" :url="'/pages/product/detail?pid=' + items.did"
+              class="activity-item" :data-Mid="items.mid || ''">
+              <view class="activity-img">
+                <image :src="items.path" />
+                <view class="activity-countdown" v-if="item.eltm16.isCountdown" :style="{
+                  backgroundColor: item.eltm16.countdownBgColor,
+                  color: item.eltm16.countdownFontColor,
+                }">
+                  <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
+                    :showType="1"></diy-countdown>
+                </view>
+                <view class="mark" v-if="item.eltm16.isLabel">
+                  <image :src="items.selectType == 12
+                    ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize3.png'
+                    : items.selectType == 13
+                      ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize1.png'
+                      : items.selectType == 14
+                        ? 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize2.png'
+                        : 'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png'
+                    " />
+                </view>
+              </view>
+              <view class="activity-info">
+                <view class="activity-name" v-if="
+                  item.eltm16.isShowPname == null || item.eltm16.isShowPname
+                " :style="{
+                  height: item.eltm16.charLine == 1 ? '30rpx' : '64rpx',
+                  '-webkit-line-clamp': item.eltm16.charLine,
+                }">
+                  {{ items.name }}
+                </view>
+                <view class="activity-desc"><label class="tip"
+                    v-if="items.selectType == 12 || items.selectType == 13">{{ items.UserLimit }}{{ __("人团")
+                    }}</label><label v-if="item.eltm16.isShowNum">{{ __("已有") }}{{ items.OrderCount }}
+                    {{ __("人参加") }}</label></view>
+                <view class="activity-price" v-if="
+                  item.eltm16.isShowPrice == null || item.eltm16.isShowPrice
+                "><label class="price" :style="{ color: item.eltm16.priceColor }">{{ __("￥") }}{{ items.ItemSalePrice
+                    }}</label><label class="del-price" v-if="items.selectType == 14">{{ __("￥") }}{{ items.MarketPice
+                    }}</label>
+                  <view class="activity-btn" :style="{
+                    backgroundColor: item.eltm16.btnBgColor,
+                    color: item.eltm16.btnFontColor,
+                  }">
+                    {{
+                      items.words ||
+                      (items.selectType == 14
+                        ? __("去秒杀")
+                        : items.selectType == 15
+                          ? __("去砍价")
+                          : __("立即开团"))
+                    }}
+                  </view>
+                </view>
+              </view>
+            </navigator>
+            <button v-else class="activity-item" :data-pid="items.did" :data-Mid="items.mid || ''"
+              @click.stop="goCutprice">
+              <view class="activity-img">
+                <image :src="items.path" />
+                <view class="activity-countdown" v-if="item.eltm16.isCountdown" :style="{
+                  backgroundColor: item.eltm16.countdownBgColor,
+                  color: item.eltm16.countdownFontColor,
+                }">
+                  <diy-countdown :startTime="items.StartTimeStr" :endTime="items.EndTimeStr"
+                    :showType="1"></diy-countdown>
+                </view>
+                <view class="mark" v-if="item.eltm16.isLabel">
+                  <image
+                    src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/auth/prize5.png" />
+                </view>
+              </view>
+              <view class="activity-info">
+                <view class="activity-name" v-if="
+                  item.eltm16.isShowPname == null || item.eltm16.isShowPname
+                " :style="{
+                  height: item.eltm16.charLine == 1 ? '30rpx' : '64rpx',
+                  '-webkit-line-clamp': item.eltm16.charLine,
+                }">
+                  {{ items.name }}
+                </view>
+                <view class="activity-desc"><label class="tip"
+                    v-if="items.selectType == 12 || items.selectType == 13">{{ items.UserLimit }}{{ __("人团")
+                    }}</label><label v-if="item.eltm16.isShowNum">{{ __("已有") }}{{ items.OrderCount }}
+                    {{ __("人参加") }}</label></view>
+                <view class="activity-price" v-if="
+                  item.eltm16.isShowPrice == null || item.eltm16.isShowPrice
+                "><label class="price" :style="{ color: item.eltm16.priceColor }">{{ __("￥") }}{{ items.ItemSalePrice
+                    }}</label><label class="del-price" v-if="items.selectType == 14">{{ __("￥") }}{{ items.MarketPice
+                    }}</label>
+                  <view class="activity-btn" :style="{
+                    backgroundColor: item.eltm16.btnBgColor,
+                    color: item.eltm16.btnFontColor,
+                  }">
+                    {{
+                      items.words ||
+                      (items.selectType == 14
+                        ? __("去秒杀")
+                        : items.selectType == 15
+                          ? __("去砍价")
+                          : __("立即开团"))
+                    }}
+                  </view>
+                </view>
+              </view>
+            </button>
+          </block>
         </view>
+      </view>
 
-        <!--301模板-->
-        <guess-you-like ref="guessYouLike" :uniId="uniId" :isFilterTop0="true" :isShowFilter="item.eltm101.isShowFilter" :isShowLoading="item.eltm101.isShowLoading" :optionStr="item.eltm101.options"  :viewtype="item.eltm101.viewtype*1" :titleText="item.eltm101.title" :titleColor="item.eltm101.titleColor" :bgColor="item.bgColor" :paddingLeft="item.paddingLeft||0"  :paddingRight="item.paddingRight||0" :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}" v-if="item.eltmType==101"></guess-you-like>
-        <!--301模板-->
+      <view v-if="item.eltmType == 17" :style="{
+        backgroundColor: item.bgColor,
+        borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+        borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+        borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+        borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+        overflow: 'hidden',
+        marginTop: item.eltm17.margin_top * 2 + 'rpx',
+        marginBottom: item.eltm17.margin_bottom * 2 + 'rpx',
+        clear: 'both',
+      }">
+        <scroll-view scroll-x>
+          <view class="coupon_box">
+            <button class="coupon_item" open-type="getUserInfo" v-if="item.eltmType == 17 && item.eltm17.layout == 1"
+              v-for="(items, idx) in item.eltm17.data" :key="idx" :data-id="items.did" :data-name="items.name"
+              :data-type="items.selectType" :data-keyword="items.keyWord || ''" :data-appid="items.AppId || ''"
+              :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl || ''" @tap="tplGoToPage" style="margin: 0">
+              <view class="coupon_price">{{ __("￥") }}{{ items.ItemSalePrice }}</view>
+              <view class="coupon_desc">{{
+                items.name || items.ProductTips
+              }}</view>
+            </button>
+            <button v-if="item.eltmType == 17 && item.eltm17.layout == 2" open-type="getUserInfo"
+              v-for="(items, idx) in item.eltm17.data" :key="idx" class="coupon_img" :data-id="items.did"
+              :data-name="items.name" :data-type="items.selectType" :data-keyword="items.keyWord || ''"
+              :data-appid="items.AppId || ''" :data-appurl="items.AppUrl" :data-MinAppUrl="item.MinAppUrl || ''"
+              @tap="tplGoToPage" style="margin: 0">
+              <image :src="items.path"></image>
+            </button>
+          </view>
 
+          
+        </scroll-view>
+      </view>
+
+      <view class="official-account" v-if="item.eltmType == 18" :style="{
+        backgroundColor: item.bgColor,
+        paddingTop: item.eltm18.paddingTop * 2 + 'rpx',
+        paddingBottom: item.eltm18.paddingBottom * 2 + 'rpx',
+        clear: 'both',
+      }">
+        <official-account @error="mpError" @load="mpLoad"></official-account>
+      </view>
+
+      <guess-you-like ref="guessYouLike" :uniId="uniId" :isFilterTop0="true" :isShowFilter="item.eltm101.isShowFilter"
+        :isShowLoading="item.eltm101.isShowLoading" :optionStr="item.eltm101.options"
+        :viewtype="item.eltm101.viewtype * 1" :titleText="item.eltm101.title" :titleColor="item.eltm101.titleColor"
+        :bgColor="item.bgColor" :paddingLeft="item.paddingLeft || 0" :paddingRight="item.paddingRight || 0" :style="{
+          backgroundColor: item.bgColor,
+          borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+          borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+          borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+          borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+          overflow: 'hidden',
+        }" v-if="item.eltmType == 101"></guess-you-like>
+
+      <store-lists ref="storeLists" :uniId="uniId" :isFilterTop0="!item.eltm102.isShowFilter"
+        :isShowFilter="item.eltm102.isShowFilter" :isShowLoading="item.eltm102.isShowLoading"
+        :optionStr="item.eltm102.options" :viewtype="item.eltm102.viewtype * 1" :titleText="item.eltm102.title"
+        :titleColor="item.eltm102.titleColor" :bgColor="item.bgColor" paddingTop="0" :style="{
+          backgroundColor: item.bgColor,
+          borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+          borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+          borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+          borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+          overflow: 'hidden',
+        }" v-if="item.eltmType == 102"></store-lists>
+
+      <guess-you-like ref="guessYouLike" :uniId="uniId" :isFilterTop0="true" :isShowFilter="item.eltm103.isShowFilter"
+        :isShowLoading="item.eltm103.isShowLoading" :optionStr="item.eltm103.options"
+        :viewtype="item.eltm103.viewtype * 1" :titleText="item.eltm103.title" :titleColor="item.eltm103.titleColor"
+        :bgColor="item.bgColor" :paddingLeft="item.paddingLeft || 0" :paddingRight="item.paddingRight || 0" :style="{
+          backgroundColor: item.bgColor,
+          borderTopLeftRadius: (item.borderTopLeftRadius || 0) + 'px',
+          borderTopRightRadius: (item.borderTopRightRadius || 0) + 'px',
+          borderBottomLeftRadius: (item.borderBottomLeftRadius || 0) + 'px',
+          borderBottomRightRadius: (item.borderBottomRightRadius || 0) + 'px',
+          overflow: 'hidden',
+        }" v-if="item.eltmType == 103"></guess-you-like>
 
-        <!--302模板-->
-        <store-lists ref="storeLists" :uniId="uniId"  :isFilterTop0="!item.eltm102.isShowFilter" :isShowFilter="item.eltm102.isShowFilter" :isShowLoading="item.eltm102.isShowLoading" :optionStr="item.eltm102.options"  :viewtype="item.eltm102.viewtype*1" :titleText="item.eltm102.title" :titleColor="item.eltm102.titleColor" :bgColor="item.bgColor" paddingTop="0" :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}"  v-if="item.eltmType==102"></store-lists>
-        <!--302模板-->
-		
-		<!--303模板-->
-		<guess-you-like ref="guessYouLike" :uniId="uniId" :isFilterTop0="true" :isShowFilter="item.eltm103.isShowFilter" :isShowLoading="item.eltm103.isShowLoading" :optionStr="item.eltm103.options"  :viewtype="item.eltm103.viewtype*1" :titleText="item.eltm103.title" :titleColor="item.eltm103.titleColor" :bgColor="item.bgColor" :paddingLeft="item.paddingLeft||0"  :paddingRight="item.paddingRight||0" :style="{backgroundColor:item.bgColor, borderTopLeftRadius: (item.borderTopLeftRadius||0) + 'px', borderTopRightRadius: (item.borderTopRightRadius||0) + 'px', borderBottomLeftRadius: (item.borderBottomLeftRadius||0) + 'px', borderBottomRightRadius: (item.borderBottomRightRadius||0) + 'px', overflow: 'hidden'}" v-if="item.eltmType==103"></guess-you-like>
-		<!--301模板-->
-    </view>
     </view>
+  </view>
 </template>
 
 <script>
@@ -699,6 +1050,8 @@ export default {
       "showCartNum",
     ]),
     async addCart(item) {
+      console.log('item-------', item);
+      
       var that = this;
       var params = {
         item_id: item.did,
@@ -713,7 +1066,7 @@ export default {
         callback: (data, status, msg, code) => {
           if (status == 200) {
             if (data.item_quantity != 0) {
-              that.$.alert(that.__("添加购物车成功"), function () {}, 400);
+              that.$.alert(that.__("添加购物车成功"), function () { }, 400);
             } else {
               uni.showToast({
                 title: "亲~商品没有库存啦！",
@@ -724,20 +1077,20 @@ export default {
             }
 
             if (that.plantformInfo.prodcut_addcart_flag) {
-              that.$store.dispatch(`getCartList`, function (data) {});
+              that.$store.dispatch(`getCartList`, function (data) { });
             }
           }
         },
       });
     },
-    addShopping(item) {},
+    addShopping(item) { },
     mpError: function (e) {
       console.info(e);
     },
     mpLoad: function (e) {
       console.info(e);
     },
-    doNothing: function () {},
+    doNothing: function () { },
     callTel: function (e) {
       let that = this;
       that.$.makePhoneCall({
@@ -762,14 +1115,15 @@ export default {
           });
           break;
         case 1:
+          // this.$emit('buy', 'hello')
           that.$.gopage("/pages/product/detail?pid=" + t.id);
           break;
         case 2:
           that.$.gopage(
             "/pages/product/list?category_id=" +
-              (t.id || 0) +
-              "&cname=" +
-              t.name
+            (t.id || 0) +
+            "&cname=" +
+            t.name
           );
           break;
         case 3:
@@ -843,13 +1197,13 @@ export default {
         case 9:
           that.$.gopage(
             "/pagesub/webpage/webpage?u=" +
-              encodeURIComponent(t.appurl) +
-              "&tn=" +
-              t.name +
-              "&tc=" +
-              t.appid +
-              "&tb=" +
-              t.keyword
+            encodeURIComponent(t.appurl) +
+            "&tn=" +
+            t.name +
+            "&tc=" +
+            t.appid +
+            "&tb=" +
+            t.keyword
           );
           break;
         case 99:
@@ -944,8 +1298,8 @@ export default {
               var url = up_res.data.url;
               e(url);
             },
-            fail: function (t) {},
-            complete: function (t) {},
+            fail: function (t) { },
+            complete: function (t) { },
           });
       }
     },
@@ -1125,7 +1479,6 @@ export default {
 };
 </script>
 
-
 <style lang="scss">
 @import "../../styles/_variables";
 
diff --git a/components/themes/shoptheme1.vue b/components/themes/shoptheme1.vue
index fead08a..c909e02 100644
--- a/components/themes/shoptheme1.vue
+++ b/components/themes/shoptheme1.vue
@@ -1,6 +1,6 @@
 <template name="shoptheme1">
 	<view>
-		<view class="m-supermarket-ad">
+		<view class="m-supermarket-ad">11111
 			<view v-if="(commonTPL.AdContent.F1ProductContents.length>0)">
 				<view class="m-supermarket-tip-list">
 					<navigator :url="'/pages/product/list?is_store_flag=' + (commonTPL.isStoreFlag) + '&store_category_id=' + (item.store_product_cat_id) + '&cname=' + (item.name)"
diff --git a/pages.json b/pages.json
index 20fc26f..a612992 100644
--- a/pages.json
+++ b/pages.json
@@ -29,6 +29,15 @@
 				}
 			}
 		},
+        {
+			"path": "pages/index/cart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
             "path": "pages/index/index",
             "style": {
@@ -115,6 +124,7 @@
                 }
             }
         },
+       
         {
             "path": "pages/index/member",
 
@@ -831,17 +841,25 @@
         {
             "root": "pagesub",
             "pages": [
-                /*
                 {
-                    "path": "category/list",
+                    "path": "index/category",
                     "style": {
-                        "navigationBarTitleText": "分类",
+                        "navigationBarTitleText": "",
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                          "titleNView": false
+                        }
+                    }
+                },
+                {
+                    "path": "index/feed",
+                    "style": {
+                        "navigationBarTitleText": "发现",
                         "app-plus": {
                             "titleNView": false
                         }
                     }
                 },
-                */
 				{
                     "path": "category/brands",
                     "style": {
@@ -852,6 +870,13 @@
                     }
                 },
 
+                {
+                    "path": "index/goods",
+                    "style": {
+                        "navigationBarTitleText": "全部商品"
+                    }
+                },
+
                 {
                     "path": "index/store",
 					"style": {
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 706b5d5..46fdcf6 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="page">
-    <!-- <status-bar :backgroundColor="'#fff'"></status-bar> -->
-    <!-- <uni-nav-bar title="购物车"></uni-nav-bar> -->
+    <!-- <status-bar :backgroundColor="'#fff'"></status-bar>
+    <uni-nav-bar title="购物车"></uni-nav-bar> -->
     <view v-if="loadComplete">
       <block v-if="isdata">
         <view class="manage" @click="showDelBtn">{{
@@ -910,11 +910,11 @@
 
 <script>
 import guessYouLike from "@/components/product-list.vue";
-import statusBar from "../../components/status-bar.vue";
+import statusBar from "@/components/status-bar.vue";
 import { theme_bg } from "@/styles/_variables.scss";
 
 import { mapState, mapMutations } from "vuex";
-import statecode from "../../config/statecode";
+import statecode from "@/config/statecode";
 
 export default {
   data: function () {
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
new file mode 100644
index 0000000..901812d
--- /dev/null
+++ b/pages/index/cart.vue
@@ -0,0 +1,2190 @@
+<template>
+  <view class="page">
+    <!-- <status-bar :backgroundColor="'#fff'"></status-bar>
+    <uni-nav-bar title="购物车"></uni-nav-bar> -->
+    <view v-if="loadComplete">
+      <block v-if="isdata">
+        <view class="manage" @click="showDelBtn">{{
+          !showDelList ? "管理" : "退出管理"
+        }}</view>
+        <view class="m-product-all" style="padding-bottom: 10rpx">
+          <view class="m-product-list">
+            <block
+              v-for="(store_items, storeindex) in cartlist.items"
+              :key="storeindex"
+            >
+              <view class="store-box">
+                <view class="m-store" :data-id="store_items.store_id">
+                  <view class="m-store-c">
+                    <view
+                      class="m-store-ck"
+                      @click="ckStore"
+                      :data-id="store_items.store_id"
+                      :data-isck="store_items.cart_select"
+                      :data-checkable="store_items.store_checkable"
+                    >
+                      <uni-icons
+                        :type="
+                          store_items.cart_select ? 'circle-filled' : 'circle'
+                        "
+                        :color="store_items.cart_select ? theme_bg : '#e3e3e3'"
+                        size="28"
+                      />
+                    </view>
+                    <navigator
+                      :url="
+                        '/pagesub/index/store?store_id=' + store_items.store_id
+                      "
+                      class="m-cell m-cell-access"
+                      style=""
+                      hover-class="none"
+                    >
+                      <view class="m-cell-bd m-cell-primary">
+                        <p class="m-store-info">
+                          {{ store_items.store_name }}
+                        </p>
+                      </view>
+                      <text class="m-cell-ft"></text>
+                    </navigator>
+                  </view>
+                </view>
+                <view
+                  v-for="(item, itemindex) in store_items.items"
+                  :key="itemindex"
+                  class="m-product-item"
+                >
+                  <view
+                    :class="{ 'm-item-c': 1 }"
+                    @touchstart="removestart"
+                    @touchmove="removeload"
+                    @touchend="removeend"
+                    :data-id="item.cart_id"
+                    @longpress.stop="pressDelCart"
+                  >
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + item.item_id"
+                      style="
+                        font-size: 28rpx;
+                        line-height: 2;
+                        display: flex;
+                        height: 100%;
+                        width: 100%;
+                      "
+                    >
+                      <view
+                        class="m-cart-ck"
+                        @click.stop="ckitem"
+                        :data-id="item.cart_id"
+                        :data-isck="item.cart_select"
+                      >
+                        <uni-icons
+                          :type="item.cart_select ? 'circle-filled' : 'circle'"
+                          :color="item.cart_select ? theme_bg : '#e3e3e3'"
+                          size="28"
+                        />
+                      </view>
+                      <view class="m-product-img">
+                        <image
+                          lazy-load
+                          :src="$.img(item.product_image, 200, 200)"
+                        />
+                      </view>
+                      <view class="m-product-info">
+                        <view class="m-product-name">
+                          <image
+                            v-if="item.product_state_id == 1002"
+                            lazy-load
+                            style=""
+                            class="off-shelf-simg"
+                            src="http://static.lancerdt.com/xcxfile/appicon/xiajia.png"
+                          />
+
+                          <label>
+                            <label
+                              ><text
+                                v-if="item.show_typename"
+                                class="tag tag-orange"
+                                >{{ item.show_typename }}</text
+                              >{{ item.product_name }}</label
+                            >
+                          </label>
+                          <label class="m-min-name" style="">{{
+                            item.item_spec_name ? item.item_spec_name : ""
+                          }}</label>
+                        </view>
+
+                        <view class="m-product-box">
+                          <view class="m-product-price">
+                            <block v-if="item.item_sale_price">
+                              <label>{{ __("￥") }}</label>
+                              {{ number_format(item.item_sale_price, 2) }}
+                              <label
+                                class="pre-info-price"
+                                v-if="item.discount_sale_money"
+                                >-{{ __("￥")
+                                }}{{
+                                  number_format(item.discount_sale_money, 2)
+                                }}</label
+                              >
+                            </block>
+
+                            <block v-if="item.item_unit_points">
+                              <label
+                                class="pre-info-price"
+                                style="margin: 0rpx 10rpx"
+                                >+</label
+                              ><label style="font-size: 14px">{{
+                                item.item_unit_points
+                              }}</label
+                              ><label>{{ __("积分") }}</label>
+                            </block>
+                            <block v-if="item.item_unit_sp">
+                              <label
+                                class="pre-info-price"
+                                style="margin: 0rpx 10rpx"
+                                >+</label
+                              ><label style="font-size: 14px">{{
+                                item.item_unit_sp
+                              }}</label
+                              ><label>{{ __("众宝") }}</label>
+                            </block>
+                          </view>
+                          <block>
+                            <view class="u-cart-num">
+                              <view
+                                class="u-num-btn thin-border-right"
+                                @click.stop="sub"
+                                :data-num="item.cart_quantity"
+                                :data-stock="
+                                  item.cart_quantity + item.buy_limit
+                                "
+                                :data-cid="item.cart_id"
+                                :data-skuid="item.item_id"
+                                :data-userid="item.user_id"
+                                >-</view
+                              >
+                              <input
+                                type="number"
+                                :value="item.cart_quantity"
+                                @click.stop
+                                @blur="writenum"
+                                :data-stock="
+                                  item.cart_quantity + item.buy_limit
+                                "
+                                :data-cid="item.cart_id"
+                                :data-skuid="item.item_id"
+                                :data-userid="item.user_id"
+                              />
+                              <view
+                                class="u-num-btn thin-border-left"
+                                @click.stop="add"
+                                :data-num="item.cart_quantity"
+                                :data-stock="
+                                  item.cart_quantity + item.buy_limit
+                                "
+                                :data-cid="item.cart_id"
+                                :data-skuid="item.item_id"
+                                :data-userid="item.user_id"
+                                >+</view
+                              >
+                            </view>
+                          </block>
+                          <label
+                            class="u-del iconfont icon-delete"
+                            :data-id="item.cart_id"
+                            @click.stop.prevent="delcart"
+                            @touchstart.stop.prevent
+                            @touchmove.stop.prevent
+                            @touchend.stop.prevent="delcart"
+                          >
+                          </label>
+                        </view>
+                        <!-- <block v-else>
+						<view class="u-cart-num">
+						  <view class="u-num-btn">-</view>
+						  <input type="text" :value="(item.cart_quantity)" />
+						  <view class="u-num-btn">+</view>
+						</view>
+					  </block> -->
+                      </view>
+                    </navigator>
+                  </view>
+                  <!-- 模板调用单品加价购、赠品、满减 -->
+                  <!--
+				  pulse_gift_cart
+				  pulse_bargains
+				  pulse_bargains_cart
+				  pulse_reduction
+				  -->
+                  <!-- pulse_gift_cart -->
+                  <view
+                    v-if="item.pulse_gift_cart.length > 0"
+                    v-for="(pluse, giftindex) in item.pulse_gift_cart"
+                    :key="giftindex"
+                    class="m-item-act"
+                    :data-id="pluse.cart_id"
+                  >
+                    <view
+                      class="m-cart-ck"
+                      :data-id="pluse.cart_id"
+                      :data-isck="pluse.cart_select"
+                    >
+                    </view>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="m-product-img m-act-img"
+                    >
+                      <image
+                        lazy-load
+                        :src="$.img(pluse.product_image, 200, 200)"
+                      />
+                    </navigator>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="act-item-name"
+                      style="
+                        height: 100rpx;
+                        line-height: 100rpx;
+                        font-size: 28rpx;
+                      "
+                    >
+                      <label
+                        >【{{ __("赠品") }}】{{
+                          pluse.product_item_name
+                        }}</label
+                      >
+                    </navigator>
+                    <view
+                      v-if="pluse.selectable"
+                      class="m-act-change"
+                      :data-storeindex="storeindex"
+                      :data-itemindex="itemindex"
+                      :data-giftindex="giftindex"
+                      :data-isck="pluse.cart_select"
+                      @click="chooseItemGift"
+                      >{{ __("修改") }}</view
+                    >
+                  </view>
+
+                  <!-- pulse_reduction -->
+                  <block
+                    v-if="item.pulse_reduction.length > 0"
+                    v-for="(pluse, reductionindex) in item.pulse_reduction"
+                    :key="reductionindex"
+                  >
+                    <view v-if="pluse.reduceMoney > 0" class="m-item-act">
+                      <view
+                        class="m-cart-ck"
+                        @click="ckitem"
+                        :data-id="pluse.cart_id"
+                        :data-isck="pluse.cart_select"
+                      >
+                      </view>
+                      <view
+                        class="m-product-img icon-activity icon-activity-reduction"
+                      >
+                      </view>
+                      <view
+                        class="act-item-name"
+                        style="
+                          height: 160rpx;
+                          line-height: 160rpx;
+                          font-size: 28rpx;
+                        "
+                      >
+                        <label
+                          >【{{
+                            sprintf(__("满减 -￥%s"), mf(pluse.reduceMoney, 2))
+                          }}】</label
+                        >
+                        <!--(pluse.actName)-->
+                      </view>
+                    </view>
+                  </block>
+                  <!-- pulse_reduction -->
+                  <block
+                    v-if="item.pulse_multple.length > 0"
+                    v-for="(pluse, reductionindex) in item.pulse_multple"
+                    :key="reductionindex"
+                  >
+                    <view v-if="pluse.reduceMoney > 0" class="m-item-act">
+                      <view
+                        class="m-cart-ck"
+                        @click="ckitem"
+                        :data-id="pluse.cart_id"
+                        :data-isck="pluse.cart_select"
+                      >
+                      </view>
+                      <view
+                        class="m-product-img icon-activity icon-activity-reduction"
+                      >
+                      </view>
+                      <view
+                        class="act-item-name"
+                        style="
+                          height: 160rpx;
+                          line-height: 160rpx;
+                          font-size: 28rpx;
+                        "
+                      >
+                        <label
+                          >【{{
+                            sprintf(
+                              __("多件折 -￥%s"),
+                              mf(pluse.reduceMoney, 2)
+                            )
+                          }}】</label
+                        >
+                        <!--(pluse.actName)-->
+                      </view>
+                    </view>
+                  </block>
+
+                  <!-- pulse_bargains_cart -->
+                  <view
+                    v-if="item.pulse_bargains_cart.length > 0"
+                    v-for="(pluse, bargainsindex) in item.pulse_bargains_cart"
+                    :key="bargainsindex"
+                    class="m-item-act"
+                    :data-id="pluse.cart_id"
+                  >
+                    <image
+                      v-if="pluse.product_state_id == 1002"
+                      lazy-load
+                      class="off-shelf-simg"
+                      src="http://static.lancerdt.com/xcxfile/appicon/xiajia.png"
+                    />
+                    <view
+                      class="m-cart-ck"
+                      @click="ckitem"
+                      :data-id="pluse.cart_id"
+                      :data-isck="pluse.cart_select"
+                    >
+                      <uni-icons
+                        :type="pluse.cart_select ? 'circle-filled' : 'circle'"
+                        :color="pluse.cart_select ? theme_bg : '#e3e3e3'"
+                        size="28"
+                      />
+                    </view>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="m-product-img m-act-img"
+                    >
+                      <image
+                        lazy-load
+                        :src="$.img(pluse.product_image, 200, 200)"
+                      />
+                    </navigator>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="act-item-name"
+                      style="
+                        height: 100rpx;
+                        line-height: 100rpx;
+                        font-size: 28rpx;
+                        width: 260rpx;
+                      "
+                    >
+                      <label
+                        >【{{ __("加价购") }}】{{
+                          pluse.product_item_name
+                        }}</label
+                      >
+                    </navigator>
+
+                    <block>
+                      <view class="u-cart-num" style="right: 122rpx">
+                        <view
+                          class="u-num-btn"
+                          @click="sub"
+                          :data-num="pluse.cart_quantity"
+                          :data-stock="pluse.cart_quantity + pluse.buy_limit"
+                          :data-cid="pluse.cart_id"
+                          :data-skuid="pluse.item_id"
+                          :data-userid="pluse.user_id"
+                          >-</view
+                        >
+                        <input
+                          :type="number"
+                          :value="pluse.cart_quantity"
+                          @blur="writenum"
+                          :data-stock="pluse.cart_quantity + pluse.buy_limit"
+                          :data-cid="pluse.cart_id"
+                          :data-skuid="pluse.item_id"
+                          :data-userid="pluse.user_id"
+                        />
+                        <view
+                          class="u-num-btn"
+                          @click="add"
+                          :data-num="pluse.cart_quantity"
+                          :data-stock="pluse.cart_quantity + pluse.buy_limit"
+                          :data-cid="pluse.cart_id"
+                          :data-skuid="pluse.item_id"
+                          :data-userid="pluse.user_id"
+                          >+</view
+                        >
+                      </view>
+                    </block>
+                  </view>
+
+                  <!-- pulse_bargains -->
+                  <block
+                    v-if="item.pulse_bargains.length > 0"
+                    v-for="(pluse, bargainsindex) in item.pulse_bargains"
+                    :key="bargainsindex"
+                  >
+                    <view
+                      class="m-item-act"
+                      v-if="pluse.length > 0 || pluse.actId"
+                      :data-id="pluse.cart_id"
+                    >
+                      <image
+                        v-if="pluse.product_state_id == 1002"
+                        lazy-load
+                        class="off-shelf-simg"
+                        src="http://static.lancerdt.com/xcxfile/appicon/xiajia.png"
+                      />
+                      <view
+                        class="m-cart-ck"
+                        v-if="pluse.selectable"
+                        :data-storeindex="storeindex"
+                        :data-itemindex="itemindex"
+                        :data-bargainsindex="bargainsindex"
+                        :data-isck="pluse.cart_select"
+                        @click="chooseItemBargains"
+                      >
+                        <uni-icons
+                          class="iconfont icon-add"
+                          style="
+                            font-size: 44rpx;
+                            position: relative;
+                            top: 10rpx;
+                            color: green;
+                          "
+                        />
+                      </view>
+                      <view
+                        class="m-cart-ck"
+                        v-else
+                        @click="chooseRaiseBuyItem"
+                        :data-item_id="pluse.item_id"
+                        :data-activity_id="pluse.actId"
+                        :data-activity_item_id="pluse.activity_item_id"
+                        :data-cart_type="1"
+                        :data-isck="pluse.cart_select"
+                      >
+                        <uni-icons
+                          :type="isckall ? 'circle-filled' : 'circle'"
+                          :color="isckall ? theme_bg : '#e3e3e3'"
+                          size="28"
+                        />
+                      </view>
+
+                      <navigator
+                        hover-class="none"
+                        :url="'/pages/product/detail?pid=' + pluse.item_id"
+                        class="m-product-img m-act-img"
+                      >
+                        <image
+                          lazy-load
+                          :src="$.img(pluse.product_image, 200, 200)"
+                        />
+                      </navigator>
+                      <navigator
+                        hover-class="none"
+                        :url="'/pages/product/detail?pid=' + pluse.item_id"
+                        class="act-item-name"
+                        style="
+                          height: 100rpx;
+                          line-height: 100rpx;
+                          font-size: 28rpx;
+                        "
+                      >
+                        <label
+                          >【{{
+                            sprintf(
+                              __("加价 ￥%s 购买"),
+                              mf(pluse.item_sale_price, 2)
+                            )
+                          }}】</label
+                        >
+                      </navigator>
+                    </view>
+                  </block>
+                </view>
+
+                <!-- 店铺加价购 pulse_bargains -->
+                <view
+                  class="m-product-item"
+                  v-if="store_items.bargains.length > 0"
+                  v-for="(pluse, bargainsindex) in store_items.bargains"
+                  :key="bargainsindex"
+                >
+                  <view
+                    class="m-item-act"
+                    v-if="pluse.length > 0 || pluse.actId"
+                    :data-id="pluse.cart_id"
+                  >
+                    <view
+                      class="m-cart-ck"
+                      v-if="pluse.selectable"
+                      :data-storeindex="storeindex"
+                      :data-itemindex="itemindex"
+                      :data-bargainsindex="bargainsindex"
+                      :data-isck="pluse.cart_select"
+                      @click="chooseStoreBargains"
+                    >
+                      <uni-icons
+                        class="iconfont icon-add"
+                        style="
+                          font-size: 44rpx;
+                          position: relative;
+                          top: 10rpx;
+                          color: green;
+                        "
+                      />
+                    </view>
+                    <view
+                      class="m-cart-ck"
+                      v-else
+                      @click="chooseRaiseBuyItem"
+                      :data-item_id="pluse.item_id"
+                      :data-activity_id="pluse.actId"
+                      :data-activity_item_id="pluse.item_id"
+                      :data-cart_type="1"
+                      :data-isck="pluse.cart_select"
+                    >
+                      <uni-icons
+                        :type="isckall ? 'circle-filled' : 'circle'"
+                        :color="isckall ? theme_bg : '#e3e3e3'"
+                        size="28"
+                      />
+                    </view>
+
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="m-product-img m-act-img"
+                    >
+                      <image
+                        lazy-load
+                        :src="$.img(pluse.product_image, 200, 200)"
+                      />
+                    </navigator>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="act-item-name"
+                      style="
+                        height: 100rpx;
+                        line-height: 100rpx;
+                        font-size: 28rpx;
+                      "
+                    >
+                      <label
+                        >【{{
+                          sprintf(
+                            __("加价 ￥%s 购买"),
+                            mf(pluse.item_sale_price, 2)
+                          )
+                        }}】</label
+                      >
+                    </navigator>
+                  </view>
+                </view>
+
+                <!-- 店铺赠品 activitys.gift -->
+                <view
+                  class="m-product-item"
+                  v-if="store_items.activitys.gift.length > 0"
+                  v-for="(pluse, giftindex) in store_items.activitys.gift"
+                  :key="giftindex"
+                >
+                  <view
+                    class="m-item-act"
+                    v-if="pluse.length > 0 || pluse.actId"
+                    :data-id="pluse.cart_id"
+                  >
+                    <view
+                      class="m-cart-ck"
+                      :data-id="pluse.cart_id"
+                      :data-isck="pluse.cart_select"
+                    >
+                    </view>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="m-product-img m-act-img"
+                    >
+                      <image
+                        lazy-load
+                        :src="$.img(pluse.product_image, 200, 200)"
+                      />
+                    </navigator>
+                    <navigator
+                      hover-class="none"
+                      :url="'/pages/product/detail?pid=' + pluse.item_id"
+                      class="act-item-name"
+                      style="
+                        height: 100rpx;
+                        line-height: 100rpx;
+                        font-size: 28rpx;
+                      "
+                    >
+                      <label
+                        >【{{ __("赠品") }}】{{
+                          pluse.product_item_name
+                        }}</label
+                      >
+                    </navigator>
+                    <view
+                      v-if="pluse.selectable"
+                      class="m-act-change"
+                      :data-storeindex="storeindex"
+                      :data-itemindex="itemindex"
+                      :data-giftindex="giftindex"
+                      :data-isck="pluse.cart_select"
+                      @click="chooseStoreGift"
+                      >{{ __("修改") }}</view
+                    >
+                  </view>
+                </view>
+
+                <!-- 店铺满减 activitys.reduction  -->
+                <view
+                  class="m-product-item"
+                  v-if="store_items.activitys.reduction.length > 0"
+                  v-for="(pluse, reductionindex) in store_items.activitys
+                    .reduction"
+                  :key="reductionindex"
+                >
+                  <view
+                    class="m-item-act"
+                    v-if="
+                      (pluse.length > 0 || pluse.actId) && pluse.reduceMoney > 0
+                    "
+                    :data-id="pluse.cart_id"
+                  >
+                    <view
+                      class="m-cart-ck"
+                      @click="ckitem"
+                      :data-id="pluse.cart_id"
+                      :data-isck="pluse.cart_select"
+                    >
+                    </view>
+                    <view
+                      class="m-product-img icon-activity icon-activity-reduction"
+                    >
+                    </view>
+                    <view
+                      class="act-item-name"
+                      style="
+                        height: 160rpx;
+                        line-height: 160rpx;
+                        font-size: 28rpx;
+                      "
+                    >
+                      <label
+                        >【{{
+                          sprintf(__("满减 -￥%s"), mf(pluse.reduceMoney, 2))
+                        }}】</label
+                      >
+                      <!--(pluse.actName)-->
+                    </view>
+                  </view>
+                </view>
+                <!-- 店铺多件折 activitys.reduction  -->
+                <view
+                  class="m-product-item"
+                  v-if="store_items.activitys.multple.length > 0"
+                  v-for="(pluse, reductionindex) in store_items.activitys
+                    .multple"
+                  :key="reductionindex"
+                >
+                  <view
+                    class="m-item-act"
+                    v-if="
+                      (pluse.length > 0 || pluse.actId) && pluse.reduceMoney > 0
+                    "
+                    :data-id="pluse.cart_id"
+                  >
+                    <view
+                      class="m-cart-ck"
+                      @click="ckitem"
+                      :data-id="pluse.cart_id"
+                      :data-isck="pluse.cart_select"
+                    >
+                    </view>
+                    <view
+                      class="m-product-img icon-activity icon-activity-reduction"
+                    >
+                    </view>
+                    <view
+                      class="act-item-name"
+                      style="
+                        height: 160rpx;
+                        line-height: 160rpx;
+                        font-size: 28rpx;
+                      "
+                    >
+                      <label
+                        >【{{
+                          sprintf(__("多件折 -￥%s"), mf(pluse.reduceMoney, 2))
+                        }}】</label
+                      >
+                      <!--(pluse.actName)-->
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </block>
+          </view>
+        </view>
+        <view class="u-cleanbox"></view>
+        <view class="m-footer-btn">
+          <view class="m-footer-btn-list">
+            <view class="m-footer-btn-item m-footer-btn-item-left">
+              <view class="m-cart-ck" @click="ckall" :data-isck="isckall">
+                <uni-icons
+                  :type="isckall ? 'circle-filled' : 'circle'"
+                  :color="isckall ? theme_bg : '#e3e3e3'"
+                  size="28"
+                />
+              </view>
+              <view
+                style="
+                  padding-right: 10rpx;
+                  display: initial;
+                  line-height: 48px;
+                "
+                >{{ __("全选") }}</view
+              >
+              <!-- <view class="m-cart-del" @click="delAll" v-show="showDelList">
+                <view class="btn-del">
+                  删除
+                </view>
+              </view> -->
+            </view>
+            <view class="m-footer-btn-item m-cart-total" v-show="!showDelList">
+              <view style="line-height: 1.8; font-size: 12px"
+                >{{ __("合计：") }}
+                <block v-if="cartlist.orderSelMoneyAmount">
+                  <label style="font-size: 12px">{{ __("￥") }}</label
+                  ><text>{{
+                    number_format(cartlist.orderSelMoneyAmount, 2)
+                  }}</text>
+                </block>
+
+                <block v-if="cartlist.orderSelPointsAmount">
+                  <label style="margin: auto 8rpx">+</label
+                  ><text v-if="cartlist.orderSelPointsAmount">
+                    {{ number_format(cartlist.orderSelPointsAmount) }}</text
+                  ><label style="font-size: 12px">{{ __("积分") }}</label>
+                </block>
+
+                <block v-if="cartlist.orderSelSpAmount">
+                  <label style="margin: auto 10rpx">+</label
+                  ><text v-if="cartlist.orderSelSpAmount">
+                    {{ number_format(cartlist.orderSelSpAmount) }}</text
+                  ><label>{{ __("众宝") }}</label>
+                </block>
+              </view>
+              <view style="font-size: 20rpx; line-height: 28rpx"
+                ><label style="margin-right: 10rpx; color: #888"
+                  >{{ __("优惠:￥")
+                  }}{{ number_format(cartlist.orderDiscountAmount, 2) }}</label
+                >
+                {{ __("不含运费") }}
+              </view>
+            </view>
+          </view>
+          <view
+            class="m-footer-btn-main"
+            v-show="!showDelList"
+            @click="submitorder"
+          >
+            {{ sprintf(__("结算(%s)"), cartlist.Total) }}
+          </view>
+          <view class="m-footer-btn-main" v-show="showDelList" @click="delAll">
+            删除
+          </view>
+        </view>
+
+        <view
+          :class="{ 'm-panel-sp': 1, hide: selectsp == 0 }"
+          @click="closesp"
+        >
+          <view
+            :style="'bottom:' + barBottom + 'px'"
+            :class="
+              'm-panel-sp-content ' +
+              (selectct == 0 ? 'bounceOutDown animated' : 'bounceInUp animated')
+            "
+            catchtap
+          >
+            <view class="m-panel-sp-pinfo">
+              <view class="m-panel-sp-pname">
+                <view class="m-pstock">{{ __("选择商品") }}</view>
+              </view>
+              <uni-icons
+                type="close"
+                class="m-panel-sp-icon"
+                color="#888"
+                @click="closesp"
+              />
+            </view>
+            <scroll-view class="m-panel-sp-listbox" scroll-y="true">
+              <block
+                v-for="(select_items, key1) in spdata.selecInfo"
+                :key="key1"
+              >
+                <view
+                  class="m-panel-sp-listbox-item"
+                  @click="chooseRaiseBuyItem"
+                  :data-item_id="select_items.item_id"
+                  :data-activity_id="spdata.actId"
+                  :data-activity_item_id="spdata.activity_item_id"
+                  :data-cart_type="cart_type"
+                >
+                  <view class="m-panel-sp-labellist" v-if="true">
+                    <view class="m-panel-sp-pimg">
+                      <image
+                        lazy-load
+                        :src="$.img(select_items.product_image, 200, 200)"
+                      />
+                    </view>
+                    <view class="m-panel-sp-pname"
+                      >{{ select_items.product_item_name }}
+
+                      <view class="m-product-price">
+                        <label>{{ __("￥") }}</label
+                        >{{ number_format(select_items.item_sale_price, 2) }}
+                        <label
+                          class="pre-info-price"
+                          v-if="select_items.discount_sale_money"
+                          >-{{ __("￥")
+                          }}{{
+                            number_format(select_items.discount_sale_money, 2)
+                          }}</label
+                        >
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </block>
+              <!-- <view style="height:96rpx;width:100%;"></view> -->
+            </scroll-view>
+          </view>
+        </view>
+      </block>
+      <block v-else>
+        <navigator
+          hover-class="none"
+          url="/pages/index/index"
+          open-type="switchTab"
+          class="m-nullpage"
+        >
+          <view class="m-nullpage-middle">
+            <label class="iconfont icon-konggouwuche"></label>
+            <view class="m-null-tip">
+              <text>{{ __("购物车空空如也") }}</text>
+              <text>{{ __("去挑几件中意的商品吧") }}</text>
+            </view>
+          </view>
+        </navigator>
+        <guess-you-like
+          ref="guessYouLike"
+          :isGuessFlag="isGuessFlag"
+          :isShowLoading="false"
+          :titleText="__('——猜你喜欢——')"
+        ></guess-you-like>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+import guessYouLike from "@/components/product-list.vue";
+import statusBar from "@/components/status-bar.vue";
+import { theme_bg } from "@/styles/_variables.scss";
+
+import { mapState, mapMutations } from "vuex";
+import statecode from "@/config/statecode";
+
+
+export default {
+  data: function () {
+    return {
+      options: {},
+      selectsp: 0,
+      selectct: 0,
+      cart_type: 0,
+      spdata: [],
+      flag: false,
+      isckall: false,
+      isck: false,
+      cartlist: { items: [] },
+      X_Start: 0,
+      X_End: 0,
+      T_Id: 0,
+      select_cart_ids: [],
+      isdata: false,
+      barBottom: 0,
+      itemindex: 0,
+      theme_bg: theme_bg,
+      loadComplete: false, // 没有加载数据前不显示的对应内容
+      isGuessFlag: false,
+      showDelList: false,
+    };
+  },
+  computed: mapState([
+    "Config",
+    "StateCode",
+    "notice",
+    "plantformInfo",
+    "shopInfo",
+    "userInfo",
+    "hasLogin",
+  ]),
+  components: {
+    statusBar,
+    guessYouLike,
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: async function (options) {
+    uni.setNavigationBarTitle({
+      title: this.__("购物车"),
+    });
+
+    await this.$onLaunched;
+
+    var that = this;
+
+    this.getPlantformInfo(function (plantformInfo) {
+      that.setData({
+        isGuessFlag: plantformInfo.config.esearch_enable || false,
+      });
+    });
+
+    this.notice.addNotification("RefreshCart", that.RefreshCart, that);
+  },
+
+  onShow: function () {
+    var that = this;
+
+    console.log(222);
+    this.getUserInfo(function (user) {
+      console.log(111);
+      that.getCartList();
+    });
+    this.showCartNum();
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    // 离开页面，注销事件
+    var that = this;
+    this.notice.removeNotification("RefreshCart", that);
+  },
+
+  onPullDownRefresh: function () {
+    console.log('onPullDownRefresh');
+    this.getCartList();
+  },
+
+  methods: {
+    ...mapMutations([
+      "login",
+      "logout",
+      "getPlantformInfo",
+      "forceUserInfo",
+      "getUserInfo",
+      "setCartNum",
+      "showCartNum",
+    ]),
+    showDelBtn() {
+      this.showDelList = !this.showDelList;
+    },
+    //获取平台信息
+    getPlatType: function () {
+      let platStr = null;
+      // #ifdef MP-WEIXIN
+      platStr = "weiXin";
+      //#endif
+
+      // #ifdef H5
+      platStr = "H5";
+      //#endif
+
+      // #ifdef APP-PLUS
+      platStr = "APP";
+      //#endif
+      return platStr;
+    },
+
+    //计算选中信息
+    ckalllength: function (data) {
+      var that = this,
+        selected_ids = [];
+      var total_sel = 0;
+
+      //循环所有店铺
+      if (!that.$.isNull(data.items) && data.items.length > 0) {
+        var isck = 0;
+        var isckall = 0;
+        var total = 0;
+
+        for (var store_item_index in data.items) {
+          //第一个店铺
+          //var cart_items = data.items[0].items, i = 0, s = cart_items.length;
+          var cart_items = data.items[store_item_index].items,
+            s = cart_items.length;
+          var i = 0;
+
+          for (var item in cart_items) {
+            //按照item计算 i
+            cart_items[item].cart_select &&
+              ((i = i + cart_items[item].cart_quantity),
+              selected_ids.push(cart_items[item].cart_id),
+              (isck = 1));
+          }
+
+          total = total + i;
+        }
+
+        data.Total = total;
+
+        that.setData({
+          select_cart_ids: selected_ids,
+        });
+
+        isckall = data.cart_select;
+
+        this.setData({
+          isckall: isckall,
+        });
+        this.setData({
+          isck: isck,
+        }),
+          this.setData({
+            isdata: true,
+          });
+      } else {
+        this.setData({
+          isdata: false,
+        });
+      }
+
+      return data;
+    },
+
+    //店铺全选
+    ckStore: function (e) {
+      if (!e.currentTarget.dataset.checkable) {
+        this.$.alert(this.__("商品都已下架"));
+        return false;
+      }
+      var param = {
+          //store_id: this.shopInfo.store_id,
+          UID: 0,
+          CID: e.currentTarget.dataset.id,
+          IsCK: e.currentTarget.dataset.isck ? 0 : 1,
+
+          action: "store",
+          store_id: e.currentTarget.dataset.id,
+          cart_select: parseInt(e.currentTarget.dataset.isck) ? 0 : 1,
+        },
+        that = this;
+
+      //发送购物车请求
+      that.$.request({
+        url: this.Config.URL.cart.sel,
+        data: param,
+        success: function (data, status, msg, code) {
+          that.getCartList();
+
+          if (200 != status) {
+            that.$.confirm(msg);
+          }
+          //data = that.ckalllength(data);
+          //that.setData({cartlist: data});
+        },
+      });
+    },
+
+    //单品选中
+    ckitem: function (e) {
+      // if (e.currentTarget.dataset.stateid != statecode.PRODUCT_STATE_NORMAL) {
+      // 	this.$.alert(this.__('该商品已下架'))
+      // 	return false;
+      // }
+      var param = {
+          //store_id: this.shopInfo.store_id,
+          CID: e.currentTarget.dataset.id,
+          IsCK: e.currentTarget.dataset.isck ? 0 : 1,
+
+          cart_id: e.currentTarget.dataset.id,
+          cart_select: parseInt(e.currentTarget.dataset.isck) ? 0 : 1,
+        },
+        that = this;
+
+      //发送购物车请求
+      that.$.request({
+        url: this.Config.URL.cart.sel,
+        data: param,
+        success: function (data, status, msg, code) {
+          that.getCartList();
+
+          if (200 != status) {
+            that.$.confirm(msg);
+          }
+          //data = that.ckalllength(data);
+          //that.setData({cartlist: data});
+        },
+      });
+    },
+
+    //全选
+    ckall: function (e) {
+      var param = {
+          //store_id: this.shopInfo.store_id,
+          CID: e.currentTarget.dataset.id,
+          IsCK: e.currentTarget.dataset.isck ? 0 : 1,
+
+          action: "all",
+          cart_select: parseInt(e.currentTarget.dataset.isck) ? 0 : 1,
+        },
+        that = this;
+
+      //发送购物车请求
+      that.$.request({
+        url: this.Config.URL.cart.sel,
+        data: param,
+        success: function (data, status, msg, code) {
+          that.getCartList();
+
+          if (200 != status) {
+            that.$.confirm(msg);
+          }
+          //data = that.ckalllength(data);
+          //that.setData({cartlist: data});
+        },
+      });
+    },
+
+    sub: function (e) {
+      let that = this;
+      var t = {
+        btntype: 2,
+        numval: e.currentTarget.dataset.num,
+        CID: e.currentTarget.dataset.cid,
+        stock: e.currentTarget.dataset.stock,
+        skuId: e.currentTarget.dataset.skuid,
+        userId: e.currentTarget.dataset.userid,
+      };
+
+      if (t.numval == 1) {
+        that.$.showModal({
+          title: that.__("提示"),
+          content: that.__("确认要删除这个商品吗？"),
+          success: function (n) {
+            if (n.confirm) {
+              that.unifiedNum(t);
+            }
+          },
+        });
+      } else {
+        that.unifiedNum(t);
+      }
+    },
+
+    add: function (e) {
+      let that = this;
+
+      var t = {
+        btntype: 1,
+        numval: e.currentTarget.dataset.num,
+        CID: e.currentTarget.dataset.cid,
+        stock: e.currentTarget.dataset.stock,
+        skuId: e.currentTarget.dataset.skuid,
+        userId: e.currentTarget.dataset.userid,
+      };
+
+      if (t.numval >= t.stock) {
+        that.$.alert(that.__("不能再加了"));
+        return;
+      }
+
+      this.unifiedNum(t);
+    },
+
+    writenum: function (e) {
+      var t = {
+        btntype: 3,
+        numval: e.detail.value,
+        CID: e.currentTarget.dataset.cid,
+        stock: e.currentTarget.dataset.stock,
+        skuId: e.currentTarget.dataset.skuid,
+        userId: e.currentTarget.dataset.userid,
+      };
+      this.unifiedNum(t);
+    },
+    unifiedNum: function (e) {
+      var num_obj = {
+        value: parseInt(e.numval),
+        stock: parseInt(e.stock),
+      };
+      var flagObj = {
+        btntype: e.btntype,
+        skuId: e.skuId,
+        userId: e.userId,
+      };
+      e.btntype == 1 && (num_obj.value = num_obj.value + 1);
+      e.btntype == 2 && (num_obj.value = num_obj.value - 1);
+
+      num_obj.value > num_obj.stock && (num_obj.value = num_obj.stock);
+
+      //num_obj.value <= 0 && (num_obj.value = 1);
+
+      var param = {
+        //store_id: this.shopInfo.store_id,
+        cart_id: e.CID,
+        cart_quantity: num_obj.value,
+      };
+
+      var that = this;
+      flagObj.cart_quantity = num_obj.value;
+      //发送购物车请求
+      that.$.request({
+        url: this.Config.URL.cart.quantity,
+        data: param,
+        success: function (data, status, msg, code) {
+          if (status == 200) {
+            that.getCartList(flagObj);
+          } else {
+            that.$.alert(msg);
+          }
+        },
+      });
+    },
+    // 获取购物车信息
+    getCartList: function (flagObj) {
+      var that = this;
+      var param = {};
+
+      console.log('getCartList');
+
+      this.$store.dispatch(`getCartList`, function (data) {
+        data = that.ckalllength(data);
+        that.setData({
+          cartlist: data,
+          loadComplete: true,
+        });
+
+        that.setCartNum(data.Total);
+        that.showCartNum();
+
+        that.$.stopPullDownRefresh();
+      });
+
+      return;
+      //发送购物车请求
+      that.$.request({
+        url: this.Config.URL.cart.lists,
+        data: param,
+        success: function (data) {
+          /*
+						//统计加购数据
+						if(flagObj){
+							if(flagObj.btntype==1){
+								//加一
+								var _num=1;
+							}else if(flagObj.btntype==2){
+								//减一
+								var _num=-1;
+							}else{
+								var _num=flagObj.cart_quantity;
+							}
+							uni.request({
+								url:that.Config.statisticsPath+'/kafka/shopOrder/addCartKafka',
+								method:'POST',
+								data: {
+									goodsNum:_num,
+									skuId:flagObj.skuId,
+									userId:that.$.getStorageSync('uid')
+								},
+								success:function(data, status, msg, code){
+									//console.log(data,'+++++');
+								}
+							})
+						}  */
+
+          data = that.ckalllength(data);
+
+          that.setData({
+            cartlist: data,
+          });
+
+          that.setData({
+            loadComplete: true,
+          });
+
+          that.setCartNum(data.Total);
+          that.showCartNum();
+
+          that.$.stopPullDownRefresh();
+        },
+        fail: function (data) {
+          that.setData({
+            loadComplete: true,
+          });
+          that.$.alert("网络异常请重试！");
+        },
+      });
+    },
+    removestart: function (e) {
+      this.setData({
+        X_Start: e.touches[0].pageX,
+      });
+    },
+    removeload: function (e) {
+      //console.info(e);
+      this.setData({
+        X_End: e.touches[0].pageX,
+      });
+    },
+    removeend: function (e) {
+      this.setData({
+        X_End: e.mp.changedTouches[0].pageX,
+      });
+      this.direction(e.currentTarget.dataset.id);
+    },
+    direction: function (e) {
+      var t = {
+        xstart: this.X_Start,
+        xend: this.X_End,
+      };
+
+      if (t.xstart > t.xend) {
+        if (t.xstart - t.xend > 100) {
+          this.setData({
+            T_Id: e,
+          });
+        }
+      } else {
+        this.setData({
+          T_Id: 0,
+        });
+      }
+    },
+
+    pressDelCart: function (e) {
+      var that = this;
+      e.currentTarget.dataset.id;
+
+      let itemList = [that.__("删除")];
+
+      uni.showActionSheet({
+        itemList: itemList,
+        success: (res) => {
+          if (res.tapIndex == 0) {
+            that.delcart(e);
+          } else {
+          }
+        },
+      });
+    },
+
+    // 删除购物车商品
+    delcart: function (e) {
+      var that = this;
+      that.$.showModal({
+        title: that.__("提示"),
+        content: that.__("确认要删除这个商品吗？"),
+        success: function (n) {
+          if (n.confirm) {
+            var param = {
+              cart_id: e.currentTarget.dataset.id,
+            };
+            that.$.request({
+              url: that.Config.URL.cart.remove,
+              data: param,
+              success: function (data) {
+                that.getCartList();
+              },
+            });
+          }
+        },
+      });
+    },
+    // 结算
+    submitorder: function () {
+      let that = this;
+      this.isck
+        ? that.$.navigateTo({
+            url: "/pages/checkout/checkout?ifcart=1",
+          })
+        : that.$.showModal({
+            title: that.__("提示"),
+            content: that.__("请选择需要结算商品！"),
+            showCancel: false,
+          });
+    },
+    // 删除所有商品
+    delAll: function () {
+      var that = this;
+      that.select_cart_ids.length <= 0
+        ? that.$.confirm(that.__("请选择需要删除的商品！"))
+        : that.$.confirm(
+            that.__("是否删除选中商品？"),
+            function (t) {
+              if (t.confirm) {
+                var param = {
+                  cart_id: that.select_cart_ids.toString(),
+                };
+                that.$.request({
+                  url: that.Config.URL.cart.remove,
+                  data: param,
+                  success: function (data) {
+                    that.getCartList();
+                  },
+                });
+              }
+            },
+            true
+          );
+    },
+
+    closesp: function () {
+      var that = this;
+      that.setData({
+        selectct: 0,
+        flag: false,
+      }),
+        setTimeout(function () {
+          that.setData({
+            selectsp: 0,
+          });
+        }, 1e3);
+    },
+
+    //选择礼品
+    chooseItemGift: function (e) {
+      var that = this;
+
+      var storeindex = e.currentTarget.dataset.storeindex;
+      var itemindex = e.currentTarget.dataset.itemindex;
+      var giftindex = e.currentTarget.dataset.giftindex;
+
+      var spdata =
+        that.cartlist["items"][storeindex]["items"][itemindex][
+          "pulse_gift_cart"
+        ][giftindex];
+
+      that.setData({
+        selectsp: 1,
+        selectct: 1,
+        cart_type: 3,
+        spdata: spdata,
+      });
+    },
+
+    chooseStoreGift: function (e) {
+      var that = this;
+
+      var storeindex = e.currentTarget.dataset.storeindex;
+      var itemindex = e.currentTarget.dataset.itemindex;
+      var giftindex = e.currentTarget.dataset.giftindex;
+
+      var spdata =
+        that.cartlist["items"][storeindex]["activitys"]["gift"][giftindex];
+
+      that.setData({
+        selectsp: 1,
+        selectct: 1,
+        cart_type: 3,
+        spdata: spdata,
+      });
+    },
+
+    //单品加价购
+    chooseItemBargains: function (e) {
+      var that = this;
+
+      var storeindex = e.currentTarget.dataset.storeindex;
+      var itemindex = e.currentTarget.dataset.itemindex;
+      var bargainsindex = e.currentTarget.dataset.bargainsindex;
+
+      var spdata =
+        that.cartlist["items"][storeindex]["items"][itemindex][
+          "pulse_bargains"
+        ][bargainsindex];
+
+      that.setData({
+        selectsp: 1,
+        selectct: 1,
+        cart_type: 1,
+        spdata: spdata,
+      });
+    },
+
+    //店铺加价购
+    chooseStoreBargains: function (e) {
+      var that = this;
+
+      var storeindex = e.currentTarget.dataset.storeindex;
+      var itemindex = e.currentTarget.dataset.itemindex;
+      var bargainsindex = e.currentTarget.dataset.bargainsindex;
+
+      var spdata =
+        that.cartlist["items"][storeindex]["bargains"][bargainsindex];
+
+      that.setData({
+        selectsp: 1,
+        selectct: 1,
+        cart_type: 1,
+        spdata: spdata,
+      });
+    },
+
+    //选择礼品
+    chooseRaiseBuyItem: function (e) {
+      var that = this;
+
+      var item_id = e.currentTarget.dataset.item_id;
+      var activity_id = e.currentTarget.dataset.activity_id;
+      var cart_type = e.currentTarget.dataset.cart_type; //购买类型(ENUM):1-购买; 2-积分兑换; 3-赠品; 4-活动促销
+      var activity_item_id = e.currentTarget.dataset.activity_item_id;
+      var cart_quantity = 1;
+
+      that.addActivityItemToCart(
+        item_id,
+        activity_id,
+        cart_type,
+        activity_item_id,
+        cart_quantity
+      );
+    },
+
+    addActivityItemToCart: function (
+      item_id,
+      activity_id,
+      cart_type,
+      activity_item_id,
+      cart_quantity
+    ) {
+      var that = this;
+
+      var param = {
+        item_id: item_id,
+        activity_id: activity_id,
+        cart_type: cart_type, //购买类型(ENUM):1-购买; 2-积分兑换; 3-赠品; 4-活动促销
+        activity_item_id: activity_item_id,
+        cart_quantity: cart_quantity,
+      };
+
+      that.$.request({
+        url: that.Config.URL.cart.add,
+        data: param,
+        success: function (data, status, msg, code) {
+          if (status == 200) {
+            that.$report("fb_mobile_add_to_cart", data);
+
+            that.getCartList();
+            that.setData({
+              selectct: 0,
+              flag: false,
+            }),
+              setTimeout(function () {
+                that.setData({
+                  selectsp: 0,
+                });
+              }, 1e3);
+          } else {
+            that.$.alert(msg);
+          }
+        },
+      });
+    },
+    RefreshCart: function (e) {
+      this.getCartList();
+    },
+  },
+};
+</script>
+
+
+<style lang="scss">
+@import "../../styles/_variables.scss";
+
+.m-product-all {
+  padding: 24rpx;
+  /* #ifdef MP */
+  padding-top: 0rpx;
+  /* #endif */
+}
+
+.m-product-list {
+  padding-top: 10rpx;
+
+  /* #ifdef MP */
+  padding-top: 0rpx;
+  /* #endif */
+
+  .store-box {
+    background-color: #fff;
+    border-radius: 20rpx;
+
+    margin-bottom: 30rpx;
+
+    .m-cell {
+      padding: 0;
+    }
+
+    .m-cell-access .m-cell-ft:after {
+      width: 4px;
+      height: 4px;
+      margin-top: -8rpx;
+      margin-left: 8rpx;
+    }
+  }
+}
+
+/*店铺信息 start*/
+
+.m-store:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  //border-bottom: 1px solid #ebebe7;
+  color: #ebebe7;
+  transform-origin: 0 100%;
+  transform: scaleY(0.5);
+}
+
+.m-store {
+  height: 100rpx;
+  border-bottom: 0rpx solid #e3e3e3;
+  position: relative;
+  overflow: hidden;
+}
+
+.m-store-c {
+  display: flex;
+  align-items: center;
+}
+
+.m-store-ck {
+  display: flex;
+  justify-content: center;
+  margin-left: 7px;
+  width: 27px;
+}
+
+.thin-border-right {
+  border-top-left-radius: 12rpx;
+  border-bottom-left-radius: 12rpx;
+  border: 1px solid #dddddd;
+}
+
+.thin-border-left {
+  border-top-right-radius: 12rpx;
+  border-bottom-right-radius: 12rpx;
+  border: 1px solid #dddddd;
+}
+
+.m-store-ck icon,
+.m-store-ck .uni-icons {
+  // position: absolute;
+  // top: 50%;
+  // left: 50%;
+  // margin-top: -40rpx;
+  // margin-left: -20rpx;
+}
+
+.m-store-info {
+  height: 100rpx;
+  line-height: 100rpx;
+  margin-left: 14rpx;
+  font-size: 15px;
+  font-weight: bold;
+}
+
+/*.m-store-info::before {content: " ";position: absolute;left: 0;bottom: 0;right: 0;height: 1rpx;border-bottom: 1rpx solid #e3e3e3;color: #CCCCCC;-webkit-transform-origin: 0 100%;transform-origin: 0 100%;-webkit-transform: scaleY(0.5);transform: scaleY(0.5);z-index: 3;}*/
+
+.pre-info-price {
+  height: 18rpx !important;
+  font-size: 12px !important;
+  color: #b0b0b0 !important;
+  margin: 0 0 0 10rpx !important;
+}
+
+.m-act-img {
+  width: 100rpx;
+  height: 100rpx;
+}
+
+.m-item-act {
+  position: relative;
+  height: 100%;
+  width: 850rpx;
+  height: 100rpx;
+}
+
+.act-item-name {
+  width: 360rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.m-act-change {
+  float: right;
+  width: 100rpx;
+  background-color: #fff;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 28rpx;
+  position: absolute;
+  font-size: 28rpx;
+  top: 0rpx;
+  right: 100rpx;
+  color: #888;
+  text-align: center;
+}
+
+/*选择规格遮罩 start*/
+.m-panel-sp {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  z-index: 4;
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+.m-panel-sp-content {
+  background-color: #fff;
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  box-shadow: 0px -10rpx 15rpx rgba(0, 0, 0, 0.35);
+}
+
+.m-panel-sp-pinfo {
+  height: 80rpx;
+  box-sizing: border-box;
+  padding: 20rpx;
+  position: relative;
+}
+
+.m-panel-sp-pimg {
+  width: 100rpx;
+  height: 100rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  box-sizing: border-box;
+  padding: 10rpx;
+  box-shadow: 0px 0rpx 10rpx rgba(0, 0, 0, 0.35);
+  float: left;
+}
+
+.m-panel-sp-pimg image {
+  width: 100%;
+  height: 100%;
+}
+
+.m-panel-sp-pname {
+  padding-left: 20rpx;
+  width: 580rpx;
+  /*float:right;*/
+  font-size: 28rpx;
+
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+
+  margin-top: 6rpx;
+}
+
+.manage {
+  margin: 20rpx 60rpx;
+  font-weight: bold;
+  text-align: right;
+}
+
+.m-panel-sp-pname .m-pprice {
+  color: $default-skin-bg;
+  font-size: 32rpx;
+  line-height: 50rpx;
+  font-weight: bold;
+}
+
+.m-panel-sp-icon {
+  position: absolute;
+  right: 20rpx;
+  top: 20rpx;
+}
+
+.u-cart-num::after {
+  // z-index: 99;
+  // border: 1px solid #cacaca;
+  border: none;
+}
+
+/* .m-panel-sp-listbox{height: 604rpx;} */
+.m-panel-sp-listbox-item {
+  height: 130rpx;
+  border-top: 1rpx solid #e3e3e3;
+  box-sizing: border-box;
+  padding: 10rpx 20rpx;
+}
+
+/*选择规格遮罩 end*/
+
+.u-cart-num {
+  position: relative;
+  margin-top: 12rpx;
+  z-index: 2;
+}
+
+.m-cart-ck {
+  // float: left;
+  // width: 48rpx;
+  //background-color: #fff;
+  // height: 100%;
+  // position: relative;
+  // padding-left: 0rpx;
+
+  // margin: auto 6rpx auto 14rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 27px;
+  margin: 0 7px;
+  margin-top: -16px;
+}
+
+.m-cart-ck icon,
+.m-cart-ck .uni-icons {
+  // position: absolute;
+  // top: 50%;
+  // left: 50%;
+  // margin-top: -20rpx;
+  // margin-left: -20rpx;
+}
+
+.uniui-circle-filled {
+  font-size: 24px;
+}
+
+.m-product-info {
+  width: 60%;
+  max-width: 60%;
+  height: auto;
+  padding: 0px 18px 14px 5px;
+}
+
+@media screen and (max-width: 320px) {
+  .m-product-info {
+    width: 57%;
+  }
+}
+
+@media screen and (min-width: 321px) {
+  .m-product-info {
+    width: 60%;
+  }
+}
+
+.m-product-info::before {
+  border: none;
+}
+
+.m-product-item::before {
+  content: "";
+  border: none;
+}
+
+.m-product-item:last-child::after {
+  content: "";
+  border: none;
+}
+
+.m-product-item:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  //border-bottom: 1px solid #ebebe7;
+  color: #ebebe7;
+  /*transform-origin: 0 100%;*/
+  transform: scaleY(0.5);
+}
+
+.m-product-item {
+  border-bottom: 0rpx solid #e3e3e3;
+  position: relative;
+  overflow: hidden;
+  height: auto;
+}
+
+.m-item-c {
+  position: relative;
+  height: 100%;
+  width: 850rpx;
+  //height: 212rpx;
+}
+
+.u-del {
+  position: relative;
+  font-size: 20px;
+  top: -1px;
+  color: #888888;
+}
+
+/*底部按钮 start*/
+
+.m-footer-btn:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1px solid #ebebe7;
+  color: #ebebe7;
+  transform-origin: 0 100%;
+  transform: scaleY(0.5);
+}
+
+.m-footer-btn {
+  height: 112rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  bottom: constant(safe-area-inset-bottom); 
+  bottom: env(safe-area-inset-bottom); 
+  left: 0;
+  background-color: #fff;
+  border-top: 0rpx solid #e3e3e3;
+  z-index: 3;
+
+  display: flex;
+}
+
+.m-footer-btn-list {
+  display: flex;
+  flex: 1;
+  justify-content: space-between;
+  align-items: center;
+  margin: 0 8px;
+  height: 100%;
+}
+
+.m-footer-btn-item {
+}
+
+.m-footer-btn-item-left {
+  display: flex;
+  align-items: center;
+
+  .m-cart-ck {
+    margin-top: 0;
+    display: inline;
+  }
+}
+
+.m-footer-btn-main {
+  width: 23%;
+  height: 100%;
+  float: right;
+  background: $default-skin-bg;
+  color: #fff;
+  font-size: 32rpx;
+  text-align: center;
+
+  border-radius: 9px;
+  line-height: 80rpx;
+  height: auto;
+
+  text-align: center;
+  margin: auto;
+  margin-right: 20rpx;
+}
+
+.m-cart-total {
+}
+
+.m-cart-total text {
+  font-size: 16px;
+  color: $default-skin-bg;
+}
+
+.m-cart-total label {
+  color: $default-skin-bg;
+}
+
+.m-cart-del {
+  display: flex;
+  align-items: center;
+  margin-left: 7px;
+
+  .icon-delete {
+    font-size: 20px;
+  }
+}
+
+/*底部按钮 end*/
+.del {
+  -webkit-animation: mdel 0.2s 1;
+  animation: mdel 0.2s 1;
+  left: -100rpx;
+}
+
+@-webkit-keyframes mdel {
+  0% {
+    left: 0;
+  }
+
+  100% {
+    left: -100rpx;
+  }
+}
+
+@keyframes mdel {
+  0% {
+    left: 0;
+  }
+
+  100% {
+    left: -100rpx;
+  }
+}
+
+view {
+  font-size: 28rpx;
+  line-height: 2;
+}
+
+.m-product-name {
+  line-height: 34rpx;
+  font-size: 12px;
+  min-height: 34px;
+}
+
+.m-product-item {
+  padding: 0;
+  margin-top: 0;
+  display: block;
+  background-color: transparent;
+}
+
+.m-product-img {
+  width: 80px;
+  height: 80px;
+  image {
+    // padding: 14rpx;
+    width: 80px;
+    height: 80px;
+    padding: 0;
+  }
+}
+
+.m-act-img {
+  width: 59px;
+  height: 59px;
+
+  image {
+    width: 59px;
+    height: 59px;
+  }
+}
+
+.m-product-box {
+  display: flex;
+  margin-right: 10px;
+}
+
+.m-product-price {
+  line-height: 40px !important;
+  flex: 1;
+  font-size: 12px;
+}
+
+.off-shelf-img {
+  width: 100rpx;
+  height: 100rpx;
+  float: right;
+  position: absolute;
+  right: 100rpx;
+  z-index: 3;
+}
+
+.off-shelf-simg {
+  width: 100rpx;
+  height: 100rpx;
+  float: right;
+  position: absolute;
+
+  z-index: 3;
+  right: -16rpx;
+  top: -10px;
+}
+
+.m-footer-btn-list {
+  .m-cart-ck {
+    line-height: 24px;
+    // margin-top: 24rpx;
+    margin-left: 10rpx;
+  }
+}
+
+.u-num-btn {
+  width: 60rpx;
+  line-height: 56rpx;
+  height: 56rpx;
+  background: #f9f9f9;
+}
+
+.u-cart-num {
+  width: 90px;
+  height: 25px;
+  left: -20px;
+
+  .u-num-btn {
+    width: 29px;
+    line-height: 28px;
+    height: 28px;
+    font-weight: bold;
+  }
+
+  input {
+    font-size: 15px !important;
+    width: 28px;
+    height: 28px;
+    line-height: 28px;
+    border-top: 1px solid #dddddd;
+    border-bottom: 1px solid #dddddd;
+  }
+}
+
+.tag {
+  padding: 0 10rpx;
+}
+</style>
diff --git a/pages/product/detail.vue b/pages/product/detail.vue
index e2bf25d..edd8a5b 100644
--- a/pages/product/detail.vue
+++ b/pages/product/detail.vue
@@ -973,7 +973,7 @@
 							</view>
 							<text>{{ __('客服') }}</text>
 						</view>
-						<view data-url="/pages/cart/cart" class="m-footer-btn-item" @click="goTabBar">
+						<view data-url="/pages/index/cart" class="m-footer-btn-item" @click="goTabBar">
 							<view class="m-footer-btn-icon">
 								<label class="iconfont icon-cart "></label>
 								<uni-badge v-if="cartNum>0" :text="cartNum" type="danger" style="margin-top: -12rpx;margin-left: -12rpx;"></uni-badge>
diff --git a/pagesub/index/category.vue b/pagesub/index/category.vue
new file mode 100644
index 0000000..310fa0c
--- /dev/null
+++ b/pagesub/index/category.vue
@@ -0,0 +1,1368 @@
+<template>
+  <view class="page">
+    <status-bar backgroundColor="#ffffff"></status-bar>
+
+    <search-box @click="onSearch"></search-box>
+    <view
+      class="categroy-list"
+      style="position: absolute; margin-top: 90rpx"
+      v-if="!langStandard"
+    >
+      <view>
+        <navigator
+          hover-class="none"
+          url="/activity/fightgroup/activi?cname=GR0UP PURCHASE"
+          v-if="false"
+        >
+          <image
+            lazy-load
+            mode="scaleToFill"
+            style="width: 100%; height: 188rpx"
+            src="@/static/images/diben/purchas.png"
+          />
+        </navigator>
+        <uni-collapse
+          ref="add"
+          class="warp"
+          @change="change(aid)"
+          v-for="(val, aid) in categorySecondTree"
+          :key="aid"
+        >
+          <uni-collapse-item :title="val.category_name" open="true">
+            <template v-if="categorySecondTree.length > 0">
+              <uni-list>
+                <view v-for="(cate, pi) in val.children" :key="pi">
+                  <uni-list-item
+                    v-if="cate.category_is_enable == 1"
+                    :key="pi"
+                    :title="cate.category_name"
+                    thumb=""
+                    @click="
+                      goto(cate.category_id, val.category_id, val.category_name)
+                    "
+                  />
+                </view>
+              </uni-list>
+            </template>
+          </uni-collapse-item>
+        </uni-collapse>
+      </view>
+      <view style="width: 100%; height: 100rpx"></view>
+    </view>
+
+    <view class="main" style="z-index: 100px" v-else>
+      <view class="page-body">
+        <scroll-view class="categroy-left" scroll-y>
+          <!-- <view
+            data-id="brand"
+            data-index="-2"
+            @click="switchTab"
+            :class="{ 'cate-list uni-ellipsis': 1, on: curIndex === -2 }"
+            >{{ __("品牌推荐") }}
+          </view> -->
+          <view
+            v-for="(item, category_index) in categoryFirst"
+            :key="category_index"
+            :data-id="item.category_id"
+            :data-index="category_index"
+            @click="switchTab"
+            :class="{
+              'cate-list uni-ellipsis': 1,
+              on: curIndex === category_index,
+            }"
+            >{{ item.category_name }}
+          </view>
+        </scroll-view>
+
+        <view class="categroy-right">
+          <view
+            :class="
+              curIndex == 0
+                ? 'categroy-right-box categroy-right-box-first'
+                : 'categroy-right-box'
+            "
+            :style="
+              curIndex == -2 ? 'border-radius:0;' : 'border-radius:20rpx;'
+            "
+          >
+            <block v-if="category_deep == 2">
+              <view
+                style="white-space: nowrap; overflow-y: auto"
+                class="right-cate-list"
+              >
+                <label
+                  :class="[
+                    'm-category-list',
+                    currentCid == categoryId ? 'active' : '',
+                  ]"
+                  :data-id="categoryId"
+                  @click="listProduct"
+                  >{{ __("全部") }}</label
+                >
+                <label
+                  :class="[
+                    'm-category-list',
+                    currentCid == item.category_id ? 'active' : '',
+                  ]"
+                  :data-id="item.category_id"
+                  @click="listProduct"
+                  v-for="(item, index) in categorySecondTree"
+                  :key="index"
+                  >{{ item.category_name }}</label
+                >
+              </view>
+            </block>
+            <scroll-view
+              :class="[
+                'categroy-right-scroll',
+                category_deep == 2 ? 'categroy-right-scroll-deep2' : '',
+              ]"
+              scroll-y
+              @scrolltolower="scrollbottom"
+              :scroll-top="scrollTop"
+              @scroll="scroll"
+              scroll-with-animation="true"
+            >
+              <block v-if="category_deep == 2">
+                <!--301模板-->
+                <product-list
+                  ref="productList"
+                  :uniId="ptConfig.uniId"
+                  :isFilterFixed="ptConfig.isFilterFixed"
+                  :isShowFilter="ptConfig.isShowFilter"
+                  :isShowLoading="ptConfig.isShowLoading"
+                  :options="ptConfig.options"
+                  :viewtype="ptConfig.viewtype"
+                  :titleText="ptConfig.titleText"
+                  :titleColor="ptConfig.titleColor"
+                  :bgColor="ptConfig.bgColor"
+                  :paddingLeft="ptConfig.paddingLeft"
+                  :paddingRight="ptConfig.paddingRight"
+                  :css="ptConfig.css"
+                ></product-list>
+                <!--301模板-->
+
+                <div style="height: 1px"></div>
+              </block>
+              <block v-if="category_deep == 1">
+                <!--301模板-->
+                <product-list
+                  v-if="category_deep == 1"
+                  ref="productList"
+                  :uniId="ptConfig.uniId"
+                  :isFilterFixed="ptConfig.isFilterFixed"
+                  :isShowFilter="ptConfig.isShowFilter"
+                  :isShowLoading="ptConfig.isShowLoading"
+                  :options="ptConfig.options"
+                  :viewtype="ptConfig.viewtype"
+                  :titleText="ptConfig.titleText"
+                  :titleColor="ptConfig.titleColor"
+                  :bgColor="ptConfig.bgColor"
+                  :paddingLeft="ptConfig.paddingLeft"
+                  :paddingRight="ptConfig.paddingRight"
+                  :css="{ paddingTop: '20rpx' }"
+                ></product-list>
+                <!--301模板-->
+              </block>
+              <block
+                v-else-if="category_deep == 3 && categorySecondTree.length > 0"
+              >
+                <!--上级分类 全部-->
+                <div
+                  v-if="
+                    false && curIndex !== -2 && categorySecondTree.length > 0
+                  "
+                  style="margin: 10px"
+                >
+                  <navigator
+                    :url="
+                      '/pages/product/list?category_id=' +
+                      categoryFirst[curIndex].category_id +
+                      '&cname=' +
+                      categoryFirst[curIndex].category_name +
+                      '&page_id=' +
+                      categoryFirst[curIndex].page_id
+                    "
+                    class="m-cell m-cell-access"
+                    style="padding: 30rpx 44rpx 10rpx"
+                    hover-class="none"
+                  >
+                    <view class="m-cell-bd m-cell-primary">
+                      <p>{{ __("全部分类") }}</p>
+                    </view>
+                    <text class="m-cell-ft"></text>
+                  </navigator>
+                </div>
+
+                <block v-if="curIndex !== -2">
+                  <block
+                    v-for="(item, category_order) in categorySecondTree"
+                    :key="category_order"
+                  >
+                    <div v-if="curIndex !== -2" class="category-box">
+                      <navigator
+                        :url="
+                          '/pages/product/list?category_id=' +
+                          item.category_id +
+                          '&cname=' +
+                          item.category_name +
+                          '&page_id=' +
+                          item.page_id
+                        "
+                        class="m-cell m-cell-access"
+                        style="margin-top: 0rpx"
+                        hover-class="none"
+                      >
+                        <view class="m-cell-bd m-cell-primary">
+                          <p>{{ item.category_name }}</p>
+                        </view>
+                        <text class="m-cell-ft"></text>
+                      </navigator>
+
+                      <view
+                        class="category3-list"
+                        v-for="(val, pi) in item.children"
+                        :key="val.category_id"
+                      >
+                        <navigator
+                          :url="
+                            '/pages/product/list?category_id=' +
+                            val.category_id +
+                            '&cname=' +
+                            val.category_name +
+                            '&page_id=' +
+                            val.page_id
+                          "
+                          hover-class="none"
+                        >
+                          <image lazy-load :src="val.category_image"></image>
+                          <view
+                            class="classname uni-ellipsis"
+                            style="
+                              height: 40rpx;
+                              display: inherit;
+                              white-space: inherit;
+                              word-break: break-all;
+                              line-height: 1.5;
+                            "
+                          >
+                            <text>{{ val.category_name }}</text>
+                          </view>
+                        </navigator>
+                      </view>
+                      <br />
+                    </div>
+                    <block v-else>
+                      <view class="brand-box">
+                        <view
+                          class="brand-list"
+                          v-for="(brand, inx) in item.items"
+                          v-bind:key="brand.id"
+                        >
+                          <navigator
+                            :url="
+                              '/pages/product/list?brand_id=' +
+                              brand.brand_id +
+                              '&cname=' +
+                              brand.brand_name +
+                              '&page_id=' +
+                              (brand.page_id || 0)
+                            "
+                            hover-class="none"
+                          >
+                            <image
+                              lazy-load
+                              :src="brand.brand_image"
+                              style="width: 140rpx; height: 140rpx"
+                            ></image>
+                            <view class="classname text-overflow uni-ellipsis">
+                              <text>{{ brand.brand_name }}</text>
+                            </view>
+                          </navigator>
+                        </view>
+                      </view>
+                    </block>
+                  </block>
+                </block>
+                <block v-if="curIndex == -2">
+                  <view class="brand-box">
+                    <block
+                      v-for="(item, category_order) in categorySecondTree"
+                      :key="category_order"
+                    >
+                      <view
+                        class="brand-list"
+                        v-for="(brand, inx) in item.items"
+                        v-bind:key="brand.id"
+                      >
+                        <navigator
+                          :url="
+                            '/pages/product/list?brand_id=' +
+                            brand.brand_id +
+                            '&cname=' +
+                            brand.brand_name +
+                            '&page_id=' +
+                            (brand.page_id || 0)
+                          "
+                          hover-class="none"
+                        >
+                          <image
+                            lazy-load
+                            :src="brand.brand_image"
+                            style="width: 140rpx; height: 140rpx"
+                          ></image>
+                          <view class="classname text-overflow uni-ellipsis">
+                            <text>{{ brand.brand_name }}</text>
+                          </view>
+                        </navigator>
+                      </view>
+                    </block>
+                  </view>
+                </block>
+                <div style="height: 1px"></div>
+              </block>
+            </scroll-view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="u-top">
+      <movable-area class="movableArea">
+        <movable-view
+          class="movableView"
+          @touchmove.stop.prevent="doNothing"
+          direction="all"
+          :x="initX"
+          :y="initY"
+        >
+          <image
+            src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/nav/black/nav_gotop.png"
+            :class="isQuickNav ? 'quicknav' : 'hide'"
+            @tap="returnTop"
+          ></image>
+        </movable-view>
+      </movable-area>
+    </view>
+
+    <MyTabbar
+      current="2"
+      :cartNum="cartNum"
+      :storeId="shopInfo.store_id"
+      :categoryId="shopInfo.category_id"
+    ></MyTabbar>
+  </view>
+</template>
+
+<script>
+import statusBar from "@/components/status-bar.vue";
+import uniCollapse from "@/components/uni-collapse/uni-collapse.vue";
+import uniCollapseItem from "@/components/uni-collapse-item/uni-collapse-item.vue";
+import uniList from "@/components/uni-list/uni-list.vue";
+import uniListItem from "@/components/uni-list-item/uni-list-item.vue";
+import MyTabbar from "./components/tabbar.vue";
+
+import { mapMutations, mapState } from "vuex";
+import ProductList from "@/components/product-list";
+import SearchBox from "@/uni_modules/search-box/components/search-box/search-box";
+
+let scrollTimeout = null;
+
+export default {
+  data: function () {
+    return {
+      height: 0,
+      categoryActive: 0,
+      scrollTop: 0,
+      categoryFirst: [], //默认一级分类
+      categorySecondTree: [],
+      curIndex: 0, // 一级分类Index
+      categoryId: 0, // 一级分类编号
+      storeId: 0,
+      category_deep: false, // false| 1| 2| 3，当前一级分类这个分支是几级分类，false为不确定
+      currentCid: -1, //当前选中分类
+      langStandard: true,
+
+      initX: "690",
+      initY: "1336",
+
+      w: 0,
+      screenHeight: 0,
+      oldscposition: 0,
+      isQuickNav: false,
+
+      opacity: 1,
+      background: "f1f1f1",
+      toView: 0,
+
+      ptConfig: {
+        uniId: "category",
+        isFilterFixed: false,
+        isShowFilter: false,
+        isShowLoading: true,
+        options: {},
+        viewtype: 0,
+        titleText: "",
+        titleColor: "",
+        bgColor: "",
+        paddingLeft: 0,
+        paddingRight: 0,
+        css: { paddingTop: "0rpx" },
+      },
+    };
+  },
+  computed: mapState([
+    "Config",
+    "StateCode",
+    "notice",
+    "plantformInfo",
+    "shopInfo",
+    "userInfo",
+    "hasLogin",
+    "cartNum",
+  ]),
+  components: {
+    SearchBox,
+    ProductList,
+    statusBar,
+    uniCollapse,
+    uniCollapseItem,
+    uniList,
+    uniListItem,
+    MyTabbar,
+  },
+  mounted() {
+    let view = uni.createSelectorQuery().in(this).select(".movableArea");
+    let that = this;
+
+    view
+      .fields(
+        {
+          size: true,
+          scrollOffset: true,
+        },
+        (data) => {
+          if (data) {
+            that.setData({
+              initX: data.width,
+              initY: data.height - 100,
+            });
+          }
+        }
+      )
+      .exec();
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+
+    var w = that.$.getSystemInfoSync().windowWidth;
+    //that.langStandard = that.Lang.standard;
+    that.categoryId = options.category_id;
+    that.storeId = options.store_id;
+    that.w = w;
+
+    that.$.getSystemInfo({
+      success: function (t) {
+        that.setData({ screenHeight: t.screenHeight });
+      },
+    });
+  },
+
+  onReady() {
+    var that = this;
+
+    this.height = uni.getSystemInfoSync().windowHeight;
+
+    //初始化，默认读取一级分类
+    if (that.langStandard) {
+      const params = { 
+        size: 500 ,
+        store_id: that.storeId
+      };
+      that.$.request({
+        url: that.Config.URL.product.listCategory,
+        loading: false,
+        data: params,
+        ajaxCache: {
+          timeout: that.Config.CACHE_EXPIRE,
+        },
+        success(data) {
+          that.setData({
+            categoryFirst: data.items,
+          });
+
+          that.setData({
+            categoryId: that.categoryFirst?.[that.curIndex]?.category_id,
+          });
+
+          if (that.langStandard) {
+            that.loadCategoryTree(that.categoryId);
+          }
+        },
+      });
+    } else {
+      that.loadCategoryTree(that.categoryId);
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.showCartNum();
+  },
+
+  methods: {
+    ...mapMutations([
+      "login",
+      "logout",
+      "getPlantformInfo",
+      "forceUserInfo",
+      "getUserInfo",
+      "showCartNum",
+    ]),
+
+    switchTab(e) {
+      this.setData({
+        toView: e.target.dataset.id,
+        curIndex: parseInt(e.target.dataset.index),
+        // categorySecondTree: [],
+        currentCid: e.target.dataset.id, //e.target.dataset.id,
+        //category_deep: false,
+      });
+
+      if (this.curIndex == -2) {
+        this.loadBrand(e.target.dataset.id);
+      } else {
+        this.categoryId = e.target.dataset.id;
+        this.loadCategoryTree(this.categoryId);
+      }
+    },
+    listProduct(e) {
+      let that = this;
+      let categoryId = e.target.dataset.id;
+
+      if (categoryId == 0) {
+        categoryId = that.categoryId;
+      }
+
+      that.setData({
+        currentCid: categoryId,
+      });
+
+      //设置商品请求数据
+      that.ptConfig.options = {
+        category_id: categoryId,
+      };
+    },
+    doNothing() {},
+
+    loadCategoryTree(category_id) {
+      var that = this;
+
+      that.$.request({
+        url: that.Config.URL.product.treeCategory,
+        data: {
+          category_parent_id: category_id,
+           store_id: that.storeId
+        },
+        ajaxCache: {
+          timeout: that.Config.CACHE_EXPIRE,
+        },
+        success(data) {
+          //data 即为 tree
+          if (data.length == 0) {
+            //去读取商品接口 一级分类
+            let e = { target: { dataset: { id: category_id } } };
+            that.listProduct(e);
+            that.category_deep = 1;
+          } else {
+            //计算category_deep
+            let category_deep = that.getCategoryLevel(data);
+
+            that.setData({
+              categorySecondTree: data,
+              category_deep: category_deep,
+            });
+
+            if (that.category_deep == 2) {
+              //去读取商品接口
+              let e = { target: { dataset: { id: category_id } } };
+              that.listProduct(e);
+            }
+          }
+
+          that.returnTop();
+        },
+      });
+    },
+
+    scroll: function (t) {
+      let that = this;
+
+      that.setData({ oldscposition: t.detail.scrollTop });
+
+      if (100 < t.detail.scrollTop) {
+        that.setData({ opacity: 1, background: "f8f8f8" });
+      } else {
+        that.setData({
+          opacity: 0,
+          background: "fff",
+        });
+      }
+      if (t.detail.scrollTop >= this.screenHeight) {
+        this.setData({ isQuickNav: true });
+      } else {
+        this.setData({ isQuickNav: false });
+      }
+    },
+
+    scrollbottom: function (e) {
+      var that = this;
+      uni.$emit("diy-scrollbottom", { uniId: that.ptConfig.uniId });
+    },
+
+    returnTop: function () {
+      let that = this;
+      //视图会发生重新渲染
+      that.scrollTop = that.oldscposition;
+      //当视图渲染结束 重新设置为0
+      that.$nextTick(() => {
+        that.scrollTop = 0;
+      });
+      this.setData({ isQuickNav: false });
+    },
+
+    loadBrand(category_id) {
+      //return
+
+      var that = this;
+      that.$.request({
+        url: that.Config.URL.product.brand,
+        data: {},
+        ajaxCache: {
+          timeout: that.Config.CACHE_EXPIRE,
+        },
+        success(data) {
+          that.setData({
+            categorySecondTree: data.items,
+          });
+        },
+      });
+    },
+
+    goto: function (e, r, t) {
+      uni.navigateTo({
+        url:
+          "/pages/product/list?category_id=" +
+          e +
+          "&parent_id=" +
+          r +
+          "&cname=" +
+          t,
+      });
+    },
+    change(e) {
+      if (!this.categorySecondTree[e].children.length) {
+        uni.navigateTo({
+          url:
+            "/pages/product/list?category_id=" +
+            this.categorySecondTree[e].category_id +
+            "&cname=" +
+            this.categorySecondTree[e].category_name,
+        });
+      }
+    },
+    onSearch(e) {
+      let that = this;
+      that.$.gopage("/pagesub/search/search");
+    },
+    getCategoryLevel(tree) {
+      //从第二级读取的， 只判断第二级是否有子级别
+      let lv = 2;
+
+      for (let i = 0; i < tree.length; i++) {
+        if (tree[i].children.length > 0) {
+          lv = lv + 1;
+
+          return lv;
+        }
+      }
+
+      return lv;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+@import "../../styles/_variables.scss";
+
+page {
+  background-color: #fff !important;
+}
+
+.page {
+  background-color: #fff !important;
+}
+
+uni-page-body {
+  background-color: #fff !important;
+  min-height: 100% !important;
+  height: 100% !important;
+}
+
+.page-body {
+  display: flex;
+}
+
+.top {
+  width: 100%;
+  height: 82rpx;
+  background: rgba(255, 255, 255, 1);
+  overflow: hidden;
+  position: fixed;
+  z-index: 99;
+  line-height: 82rpx;
+}
+
+.top-left {
+  margin-top: 16rpx;
+  float: left;
+}
+
+.top-left img {
+  width: 40rpx;
+  height: 52rpx;
+}
+
+.b-left {
+  float: left;
+  margin-top: -4rpx;
+}
+
+.b-left image {
+  width: 40rpx;
+  height: 40rpx;
+  margin-top: 14rpx;
+  margin-left: 20rpx;
+}
+
+.top-right {
+  width: 50rpx;
+  height: 52rpx;
+  margin-right: 24rpx;
+  margin-top: 14rpx;
+  float: right;
+}
+
+.top-right image {
+  width: 50rpx;
+  height: 52rpx;
+}
+
+.top-right view {
+  width: 50rpx;
+  height: 30rpx;
+  font-size: 24rpx;
+  position: absolute;
+  margin-top: -62rpx;
+  font-weight: 500;
+  color: rgba(255, 255, 255, 1);
+  line-height: 30rpx;
+  text-align: center;
+}
+
+.categroy-list {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.uni-collapse:before {
+  height: 0;
+}
+
+.input-view {
+  display: flex;
+  background-color: #ffffff;
+  height: 88rpx;
+  //padding: 14rpx 4%;
+  flex-wrap: nowrap;
+  line-height: 60rpx;
+}
+
+.input-view .uni-icon {
+  line-height: 60rpx !important;
+}
+
+.input-view .input {
+  height: 60rpx;
+  line-height: 60rpx;
+  width: 94%;
+  padding: 0 3%;
+}
+
+//for ZH
+
+/* .main{
+  margin-bottom:var(--window-bottom)
+} */
+
+.categroy-left {
+  position: absolute;
+  // #ifndef APP || MP
+  top: calc(60rpx + 14rpx + 14rpx + 50rpx);
+  // #endif
+  // #ifdef APP || MP
+  top: calc(60rpx + 14rpx + 14rpx + 50rpx + var(--status-bar-height) - 6rpx);
+  // #endif
+  bottom: 0;
+  z-index: 1;
+  width: 20%;
+  box-sizing: border-box;
+
+  background-color: #fff;
+}
+
+.categroy-left .cate-list {
+  text-align: center;
+  /*border-left: 3px solid #eee;*/
+  border-right: 0px solid #fff;
+  /*background-color: #eee;*/
+
+  white-space: normal;
+  height: 100rpx;
+  line-height: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.categroy-left .cate-list.on {
+  color: $default-skin-bg-active;
+  border-color: $default-skin-bg-active;
+  border-top: 0px solid #fff;
+  border-bottom: 0px solid #fff;
+  border-right: 0px solid #fff;
+  background-color: #f5f5f5;
+
+  font-weight: bold;
+  font-size: 14px;
+}
+
+.categroy-right {
+  z-index: 1;
+  width: 100%;
+  left: 20%;
+  height: auto;
+  overflow: hidden;
+  position: absolute;
+  // #ifndef APP || MP
+  top: calc(60rpx + 14rpx + 14rpx + 50rpx);
+  // #endif
+  // #ifdef APP || MP
+  top: calc(60rpx + 14rpx + 14rpx + 50rpx + var(--status-bar-height) - 6rpx);
+  // #endif
+  bottom: 0;
+
+  .categroy-right-box {
+    width: 80%;
+    height: auto;
+    overflow: hidden;
+    position: absolute;
+    background-color: #f5f5f5;
+    border-radius: 10px;
+    top: 0;
+    bottom: 0;
+  }
+
+  .categroy-right-box-first {
+    border-radius: 0px;
+  }
+
+  .right-cate-list {
+    margin-left: 20rpx;
+    margin-right: 20rpx;
+    margin-top: 20rpx;
+    background-color: #fff;
+    border-top-left-radius: 10rpx;
+    border-top-right-radius: 10rpx;
+
+    padding: 10rpx;
+  }
+}
+
+.categroy-right-scroll {
+  z-index: 1;
+  width: calc(100% - 20rpx);
+  height: calc(100% - 0rpx);
+  overflow: hidden;
+  background-color: #f5f5f5;
+  position: relative;
+
+  border-radius: 10px;
+
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+}
+
+.categroy-right-scroll-deep2 {
+  height: calc(100% - 60rpx);
+}
+
+.cate-box {
+  /*height: 100%;*/
+  /*padding:40rpx;*/
+  box-sizing: border-box;
+}
+
+.cate-box .cate-banner image {
+  display: block;
+  width: 100%;
+  height: 190rpx;
+}
+
+.cate-title {
+  position: relative;
+  height: 50rpx;
+  line-height: 50rpx;
+  padding: 30rpx 0 30rpx;
+  text-align: center;
+  color: $default-skin-bg-active;
+  font-size: 28rpx;
+}
+
+.cate-title::before {
+  position: absolute;
+  left: 100rpx;
+  top: 43rpx;
+  content: "";
+  width: 70rpx;
+  height: 4rpx;
+  background: $default-skin-bg-active;
+}
+
+.cate-title::after {
+  position: absolute;
+  right: 100rpx;
+  top: 43rpx;
+  content: "";
+  width: 70rpx;
+  height: 4rpx;
+  background: $default-skin-bg-active;
+}
+
+.category-level-2 {
+  color: lighten($default-skin-bg-active, 13.5%);
+}
+
+.category3-list {
+  display: inline-block;
+  width: 176rpx;
+  /*height: 160rpx;*/
+  text-align: center;
+  margin: 0 0rpx 0rpx 0;
+  padding: 10rpx 2rpx 10rpx 8rpx;
+
+  font-size: 24rpx;
+  vertical-align: top;
+}
+
+.category3-list image {
+  width: 108rpx;
+  height: 108rpx;
+  margin-bottom: 10rpx;
+}
+
+.category3-list:nth-child(3n) {
+  margin-right: 0;
+}
+
+/*
+.product-list {
+  display: inline-block;
+  width: 160rpx;
+
+  text-align: center;
+  margin: 0 0rpx 0rpx 0;
+  padding: 10rpx;
+
+  font-size: 24rpx;
+  vertical-align: top;
+}
+
+.product-list image {
+  width: 100rpx;
+  height: 100rpx;
+  margin-bottom: 10rpx;
+}
+
+.product-list:nth-child(3n) {
+  margin-right: 0;
+}
+*/
+
+.uni-ellipsis {
+  font-size: 12px;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  white-space: pre-wrap;
+}
+
+/* 分类子级内容 */
+.categroy-parent {
+  background-color: transparent;
+  margin-top: 14px;
+  margin-bottom: 14px;
+}
+
+.categroy-parent navigator {
+  position: relative;
+  display: block;
+  font-size: 0.545rem;
+  line-height: 1.6rem;
+  height: 1.6rem;
+  color: #6d6d6d;
+  text-align: center;
+}
+
+.categroy-parent navigator:after {
+  content: "";
+  border-bottom: 1px solid #ddd;
+  position: absolute;
+  left: 15%;
+  right: 15%;
+  top: 45%;
+}
+
+.categroy-parent navigator label {
+  display: inline-block;
+  position: relative;
+  z-index: 2;
+  padding: 0 10rpx;
+  background: #f2f2f2;
+  font-size: 26rpx;
+}
+
+/*
+.categroy-right .categroy-parent:nth-child(1) navigator label {
+  background-color: #f30213;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(2) navigator label {
+  background-color: #AC92ED;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(3) navigator label {
+  background-color: #4FC0E8;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(4) navigator label {
+  background-color: #A0D468;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(5) navigator label {
+  background-color: #48CFAE;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(6) navigator label {
+  background-color: #EC87BF;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(7) navigator label {
+  background-color: #FFCE55;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(8) navigator label {
+  background-color: #5D9CEC;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(9) navigator label {
+  background-color: #FB6E52;
+  color:#fff;
+}
+
+.categroy-right .categroy-parent:nth-child(10) navigator label {
+  background-color: #AAB2BD;
+  color:#fff;
+}
+*/
+
+/*全部商品 start*/
+.m-navbar-item {
+  padding: 20rpx 0;
+  font-size: 24rpx;
+
+  i {
+    font-size: 0rpx;
+    line-height: 0;
+    vertical-align: middle;
+    display: inline-block;
+    width: 0rpx;
+    height: 0rpx;
+    margin-left: 9.375rpx;
+    border-width: 9.375rpx;
+    border-color: #aaa transparent transparent transparent;
+    border-style: solid dashed dashed dashed;
+  }
+}
+
+.m-navbar-item:after {
+  border: none;
+}
+
+.m-navbar-item.m-navbar-item-on {
+  background-color: #fff;
+  color: $default-skin-bg;
+
+  i {
+    border-color: $default-skin-bg transparent transparent;
+  }
+}
+
+.m-navbar-item.m-navbar-item-on::before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 6rpx;
+  border-bottom: 6rpx solid $default-skin-bg;
+  color: #cccccc;
+  -webkit-transform-origin: 0 100%;
+  transform-origin: 0 100%;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  z-index: 3;
+}
+
+.m-sort {
+  position: relative;
+}
+
+.m-sort image {
+  width: 24rpx;
+  height: 24rpx;
+  position: absolute;
+  /*top: 50%;*/
+  margin-top: 10rpx;
+  margin-left: 2rpx;
+}
+
+/*全部商品 end*/
+.m-product-price1 {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+
+.num {
+  font-size: 24rpx;
+  color: #717171;
+  padding-right: 20rpx;
+  /*margin-left:260rpx; */
+}
+
+.u-pa .m-tab {
+  top: var(--window-top);
+}
+
+.filter-box {
+  top: var(--window-top);
+}
+
+.tag-view {
+  margin: 10rpx 20rpx;
+  display: inline-block;
+}
+
+.uni-numbox-value {
+  border: 2rpx solid #cccccc;
+  background-color: #ffffff;
+  width: 150rpx;
+  height: 48rpx;
+  text-align: center;
+  display: inline-block;
+}
+
+.uni-dot {
+  width: 30rpx;
+  height: 100%;
+  text-align: center;
+  display: inline-block;
+  line-height: 44rpx;
+  height: 44rpx;
+}
+
+.uni-padding-wrap {
+  overflow: hidden;
+  max-width: 400rpx;
+}
+
+/*
+.product-list {
+  position: relative;
+  z-index: 1;
+
+  &:hover {
+    z-index: 2;
+  }
+
+  .flag {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    z-index: 2;
+    width: 64px;
+    height: 20px;
+    margin-left: -32px;
+    font-size: 12px;
+    line-height: 20px;
+    text-align: center;
+    color: #fff;
+  }
+
+  .flag-reduction {
+    background-color: #e50dbb;
+    z-index: 8;
+  }
+
+  .flag-saleoff {
+    background-color: #e53935;
+    z-index: 7;
+  }
+
+  .flag-postfree {
+    background-color: #ffac13;
+    z-index: 6;
+  }
+
+  .flag-bargain {
+    background-color: #ffac13;
+    z-index: 4;
+  }
+
+  .flag-gift {
+    background-color: #2196f3;
+    z-index: 3;
+  }
+
+  .flag-new {
+    background-color: #83c44e;
+    z-index: 5;
+  }
+
+  .flag-selfsupport {
+    background-color: #f44336;
+    z-index: 10;
+
+    position: absolute;
+
+    top: 1px;
+    right: 5px;
+    left: auto;
+    width: 40px;
+  }
+}
+*/
+.placeholder-class {
+  font-size: 25rpx;
+}
+
+.button {
+  line-height: 2;
+  font-size: 34rpx;
+}
+
+.uni-common-mt {
+  margin-top: 20rpx;
+}
+
+.city {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  margin-left: 6rpx;
+  white-space: nowrap;
+}
+
+.m-cell {
+  padding: 32rpx 44rpx;
+
+  p {
+    height: 34rpx;
+    font-size: 24rpx;
+    font-weight: bold;
+    line-height: 34rpx;
+    color: #282f40;
+  }
+}
+
+.m-category-list {
+  display: inline-block;
+  font-size: 24rpx;
+  padding: 6rpx 15rpx;
+  border-radius: 8rpx;
+  margin: 10rpx;
+  color: #888;
+  border: 1rpx solid #d5d5d5;
+}
+
+.m-category-list.active {
+  color: $default-skin-bg !important;
+  border: 1rpx solid $default-skin-bg !important;
+}
+
+.m-cell-access .m-cell-ft:after {
+  /*border-color: #c3c3c3;*/
+  margin-top: -12rpx;
+
+  //display: none;
+}
+
+.category-box {
+  box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+  margin: 20rpx;
+  border-radius: 20rpx;
+
+  background-color: #fff;
+  margin-left: 10rpx;
+  margin-right: 10rpx;
+}
+
+.uni-scroll-view-content {
+  .category-box:last-child {
+  }
+}
+
+.brand-box {
+  margin: 20rpx 10rpx;
+  background: #fff;
+  border-radius: 20rpx;
+}
+
+.brand-list {
+  display: inline-block;
+  width: 160rpx;
+  text-align: center;
+  margin: 0 0px 0px 0;
+  padding: 10rpx;
+  font-size: 12px;
+  vertical-align: top;
+}
+</style>
diff --git a/pagesub/index/components/tabbar.vue b/pagesub/index/components/tabbar.vue
new file mode 100644
index 0000000..de0fabf
--- /dev/null
+++ b/pagesub/index/components/tabbar.vue
@@ -0,0 +1,176 @@
+<template>
+  <view class="sub__tabbar">
+    <view
+      :class="['item', { current: current == 1 }]"
+      @click="gopage(1, `/pagesub/index/store?store_id=${storeId}`)"
+    >
+      <view class="box">
+        <image
+          v-if="current == 1"
+          class="icon"
+          src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_home_cur.png"
+        />
+        <image v-else class="icon" src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_home.png" />
+        <view class="desc">首页</view>
+      </view>
+    </view>
+    <view
+      :class="['item', { current: current == 2 }]"
+      @click="
+        gopage(
+          2,
+          `/pagesub/index/category?category_id=${categoryId}&store_id=${storeId}`
+        )
+      "
+    >
+      <view class="box">
+        <image
+          v-if="current == 2"
+          class="icon"
+          src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_category_cur.png"
+        />
+        <image v-else class="icon" src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_category.png" />
+        <view class="desc">分类</view>
+      </view>
+    </view>
+    <!-- <view
+      :class="['item', { current: current == 3 }]"
+      @click="gopage(3,'/pagesub/index/feed')"
+      >发现</view
+    > -->
+    <view
+      :class="['item', { current: current == 4 }]"
+      @click="gopage(4, '/pages/index/cart')"
+    >
+      <view class="box">
+        <image
+          v-if="current == 4"
+          class="icon"
+          src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_shop_cur.png"
+        />
+        <image v-else class="icon" src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/icon/icon_shop.png" />
+        <view class="desc">购物车</view>
+        <text class="icon_badge">{{ goodsNum }}</text>
+      </view>
+    </view>
+    <!-- <view
+      :class="['item', { current: current == 5 }]"
+      @click="gopage(5,`/pagesub/index/goods?store_id=${storeId}`)"
+      >商品</view
+    > -->
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    current: {
+      type: Number,
+      default: 1,
+    },
+    cartNum: {
+      type: Number,
+      default: 0,
+    },
+    storeId: {
+      type: Number,
+      default: 0,
+    },
+    categoryId: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      goodsNum: 0,
+    };
+  },
+  watch: {
+    cartNum: {
+      handler(newVal) {
+        this.goodsNum = newVal;
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    gopage(tabIndex, url) {
+      if (tabIndex === this.current) {
+        console.log("当前页面，不执行跳转");
+        return;
+      }
+      this.$.navigateTo({
+        url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.sub__tabbar {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  left: 0;
+  z-index: 10;
+  display: flex;
+  align-items: center;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  padding: 4rpx 0;
+  padding-bottom: var(--safe-area-inset-bottom, 4);
+  height: 48px;
+  background: #fff;
+
+  .item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    flex: 1;
+    color: #666;
+    text-align: center;
+    position: relative;
+
+    .icon {
+      width: 48rpx;
+      height: 48rpx;
+      display: block;
+    }
+
+    .desc {
+      font-size: 24rpx;
+      line-height: 14rpx;
+    }
+
+    .icon_badge {
+      display: block;
+      position: absolute;
+      right: -5px;
+      top: -5px;
+      text-align: center;
+      line-height: 24rpx;
+      font-size: 24rpx;
+      padding: 4rpx 10rpx;
+      border-radius: 20rpx;
+      color: #fff;
+      background: #dd524d;
+    }
+
+    .box {
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      gap: 10rpx;
+    }
+
+    &.current {
+       color: #dd524d;
+       font-weight: 900;
+    }
+  }
+}
+</style>
diff --git a/pagesub/index/feed.vue b/pagesub/index/feed.vue
new file mode 100644
index 0000000..d665b99
--- /dev/null
+++ b/pagesub/index/feed.vue
@@ -0,0 +1,42 @@
+<template>
+    <view class="my_feed">
+        <image
+        lazy-load
+        mode="widthFix"
+        class="my_feedimg"
+            src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/media/media/plantform/default/20250703/fbc317620e5d41e09589d4b81703372a.jpg"
+        />
+          <MyTabbar current="3" :cartNum="cartNum" :storeId="shopInfo.store_id" :categoryId="shopInfo.category_id"></MyTabbar>
+    </view>
+</template>
+
+<script>
+import { mapMutations, mapState } from "vuex";
+import MyTabbar from "./components/tabbar.vue";
+    export default {
+        components: {
+            MyTabbar
+        },
+ computed: mapState([
+    "Config",
+    "StateCode",
+    "notice",
+    "plantformInfo",
+    "shopInfo",
+    "userInfo",
+    "hasLogin",
+    "cartNum",
+  ]),
+    }
+</script>
+
+<style lang="scss" scoped>
+.my_feed{
+   padding-bottom: 65px;
+}
+ .my_feedimg{
+          width: 100%;
+  height: auto;
+        max-width: 100%
+    }
+</style>
\ No newline at end of file
diff --git a/pagesub/index/goods.vue b/pagesub/index/goods.vue
new file mode 100644
index 0000000..14a4a4e
--- /dev/null
+++ b/pagesub/index/goods.vue
@@ -0,0 +1,1750 @@
+<template name="commonTPL">
+  <view class="page inddex-store-container">
+    <view>
+      <view class="m-banner" v-if="loadStoreInfoComplete">
+        <image :src="store_info.BackGroundPath" />
+        <view class="m-content-box"> </view>
+        <view class="m-logo">
+          <image :src="store_info.WapLogoPath" />
+        </view>
+        <view class="m-shopinfo">
+          <view style="display: flex">
+            <view
+              style="
+                font-size: 36rpx;
+                color: #fff;
+                flex: 1;
+                height: 40rpx;
+                line-height: 40rpx;
+              "
+              >{{ store_info.store_name }}</view
+            >
+            <view class="iconfont icon-qijiandian" v-if="false"></view>
+            <view class="service-star-box" v-if="store_info.store_star_num > 0">
+              <view>{{ __("综合体验") }}</view>
+              <view
+                class="m-startBox"
+                v-for="(itemIndex, ii) in [1, 2, 3, 4, 5]"
+                :key="ii"
+                :class="[
+                  'iconfont',
+                  'icon-start',
+                  itemIndex <= store_info.store_star_num ? 'sel' : '',
+                ]"
+              >
+              </view>
+            </view>
+          </view>
+          <view style="margin-left: 20rpx" v-if="false">{{
+            store_info.store_grade_name
+          }}</view>
+          <text
+            style="
+              width: 56%;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+              overflow: hidden;
+            "
+            v-if="store_info.store_slogan != ''"
+            >{{ sprintf(__("公告：%s"), store_info.store_slogan) }}</text
+          >
+        </view>
+        <view class="tag-view">
+          <uni-tag
+            :text="__('已收藏')"
+            mark="right"
+            type="gray"
+            size="normal"
+            inverted="1"
+            circle="true"
+            data-type="groupbuy"
+            v-if="store_info.analytics.store_collect"
+            @click="onUnlikeStore(store_info.store_id)"
+          ></uni-tag>
+
+          <uni-tag
+            :text="__('收藏')"
+            mark="right"
+            type="lancerdt"
+            size="normal"
+            inverted="1"
+            circle="true"
+            data-type="groupbuy"
+            v-if="store_info.analytics.store_collect < 1"
+            @click="onLikeStore(store_info.store_id)"
+          ></uni-tag>
+
+          <uni-tag
+            :text="
+              sprintf(__(' %d 次'), store_info.analytics.store_favorite_num)
+            "
+            mark="true"
+            type="lancerdt"
+            size="normal"
+            inverted="1"
+            circle="true"
+            data-type="groupbuy"
+          ></uni-tag>
+        </view>
+      </view>
+
+      <view v-if="loadStoreConfigComplete">
+          <view class="g-flex m-ba-tab" v-if="commonTPL.TemplateKey != ''">
+            <view
+              :class="[
+                'g-flex-item',
+                commonTPL.tapindex == 1 ? 'm-ba-item-select' : '',
+              ]"
+              @click="clickRecommend"
+              v-if="commonTPL.TemplateKey != 'shop6'"
+            >
+              <!--我加的判断-->
+              <view class="m-ba-icon">
+                <label class="iconfont icon-discount"></label>
+              </view>
+              <view>{{ __("推荐") }}</view>
+            </view>
+            <view
+              :class="[
+                'g-flex-item',
+                commonTPL.tapindex == 2 ? 'm-ba-item-select' : '',
+              ]"
+              @click="clickListAllProduct"
+            >
+              <view class="m-ba-icon">{{ commonTPL.shopInfo.AllProduct }}</view>
+              <view>{{ __("全部商品") }}</view>
+            </view>
+            <view
+              :class="[
+                'g-flex-item',
+                commonTPL.tapindex == 3 ? 'm-ba-item-select' : '',
+              ]"
+              @click="clickListNewProduct"
+            >
+              <view class="m-ba-icon">{{ commonTPL.shopInfo.NewProduct }}</view>
+              <view>{{ __("上新") }}</view>
+            </view>
+            <view
+              :class="[
+                'g-flex-item',
+                commonTPL.tapindex == 4 ? 'm-ba-item-select' : '',
+              ]"
+              @click="clickGetStoreData"
+            >
+              <view class="m-ba-icon">
+                <label class="iconfont icon-store"></label>
+              </view>
+              <view>{{ __("店铺简介") }}</view>
+            </view>
+            <view
+              :class="[
+                'g-flex-item',
+                commonTPL.tapindex == 4 ? 'm-ba-item-select hide' : 'hide',
+              ]"
+              @click="showSupplyProducts"
+            >
+              <view class="m-ba-icon">
+                <label class="iconfont icon-store"></label>
+              </view>
+              <view>{{ __("供应商") }}</view>
+            </view>
+          </view>
+
+          <shoptheme1
+            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop1'"
+            :commonTPL="commonTPL"
+          >
+          </shoptheme1>
+          <shoptheme2
+            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop2'"
+            :commonTPL="commonTPL"
+          >
+          </shoptheme2>
+          <shoptheme3
+            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop3'"
+            :commonTPL="commonTPL"
+          >
+          </shoptheme3>
+          <shoptheme4
+            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop4'"
+            :commonTPL="commonTPL"
+          >
+          </shoptheme4>
+          <shoptheme5
+            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop5'"
+            :commonTPL="commonTPL"
+          >
+          </shoptheme5>
+          <shoptheme6
+            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop6'"
+            :commonTPL="commonTPL"
+          >
+          </shoptheme6>
+
+          <view v-if="loadStoreCategoryComplete">
+            <shoptheme6
+              v-if="commonTPL.tapindex == 2 && commonTPL.TemplateKey == 'shop6'"
+              :commonTPL="commonTPL"
+              ref="shop6"
+            ></shoptheme6>
+            <view v-else-if="commonTPL.tapindex == 2" class="m-scroll-box">
+              <scroll-view
+                scroll-y="true"
+                @scrolltolower="scrollbottom"
+                @scroll="scrollView"
+                @scrolltoupper="scrollTop"
+                class="m-product-all"
+                :class="[
+                  'm-product-all',
+                  'u-pa',
+                  commonTPL.istop ? 'u-patop' : 'u-pabtn',
+                ]"
+              >
+                <view class="m-tab">
+                  <view class="m-navbar">
+                    <view
+                      class="m-navbar-item"
+                      :class="[
+                        'm-navbar-item',
+                        commonTPL.post.orderby == 'product_sale_num'
+                          ? 'm-navbar-item-on'
+                          : '',
+                      ]"
+                      @click="clickSortBySaleNum"
+                    >
+                      {{ __("销量") }}
+                    </view>
+                    <view
+                      class="m-navbar-item"
+                      :class="[
+                        'm-navbar-item',
+                        commonTPL.post.orderby == 'product_add_time'
+                          ? 'm-navbar-item-on'
+                          : '',
+                      ]"
+                      @click="clickNewpd"
+                    >
+                      {{ __("新品") }}
+                    </view>
+                    <view
+                      class="m-navbar-item"
+                      :class="[
+                        'm-navbar-item',
+                        commonTPL.post.orderby == 'product_unit_price'
+                          ? 'm-navbar-item-on'
+                          : '',
+                      ]"
+                      @click="clickSortByPrice"
+                    >
+                      <label class="m-sort">
+                        {{ __("价格") }}
+                        <image
+                          :src="
+                            'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/' +
+                            (commonTPL.sort == 1 ? 'sort-desc' : 'sort-asc') +
+                            '.png'
+                          "
+                        />
+                      </label>
+                    </view>
+                  </view>
+                </view>
+                <view
+                  :class="[
+                    'm-product-list',
+                    commonTPL.viewtype == 1 ? 'fadeIn animated m-listv' : '',
+                  ]"
+                >
+                  <navigator
+                    v-for="(item, i) in commonTPL.pdlist"
+                    :key="i"
+                    :url="
+                      '/pages/product/detail?is_store_flag=' +
+                      commonTPL.isStoreFlag +
+                      '&pid=' +
+                      item.id
+                    "
+                    class="m-product-item"
+                    style="border-radius: 19rpx"
+                  >
+                    <view class="m-product-img">
+                      <image
+                        :src="item.ProductPic"
+                        mode="aspectFill"
+                        style="border-radius: 19rpx"
+                      />
+                    </view>
+                    <view class="m-product-info">
+                      <view class="m-product-name">
+                        <label>{{ item.SalesName }}</label>
+                      </view>
+                      <view class="m-product-price">
+                        <block v-if="item.ItemSalePrice">
+                          <label>{{ __("￥") }}</label
+                          >{{ number_format(item.ItemSalePrice, 2) }}
+                        </block>
+
+                        <block v-if="item.product_unit_points">
+                          <label style="margin: 0rpx 10rpx">+</label
+                          ><label style="font-size: 32rpx">{{
+                            number_format(item.product_unit_points)
+                          }}</label>
+                          <label>{{ __("积分") }}</label>
+                        </block>
+
+                        <block v-if="item.product_unit_sp">
+                          <label style="margin: 0rpx 10rpx">+</label
+                          ><label style="font-size: 32rpx">{{
+                            item.product_unit_sp
+                          }}</label>
+                          <label>{{ __("众宝") }}</label>
+                        </block>
+                      </view>
+                    </view>
+                  </navigator>
+                </view>
+                <view class="u-top-default">
+                  <view class="u-view" @click="onViewType">
+                    <label
+                      :class="[
+                        'iconfont zc',
+                        commonTPL.viewtype == 1
+                          ? 'zc-viewlist'
+                          : 'zc-viewgallery',
+                      ]"
+                    ></label>
+                  </view>
+                  <view class="u-back hide" @click="retruntop">
+                    <label class="iconfont icon-fanhuidingbu"></label>
+                  </view>
+                </view>
+                <view class="m-loading-box">
+                  <block v-if="commonTPL.ispage">
+                    <view class="u-loadmore">
+                      <label class="u-loading"></label>
+                      <text class="u-loadmore-tips">{{ __("正在加载") }}</text>
+                    </view>
+                  </block>
+                  <block v-else>
+                    <view class="u-loadmore u-loadmore-line">
+                      <text class="u-loadmore-tips">{{
+                        __("没有更多数据啦！")
+                      }}</text>
+                    </view>
+                  </block>
+                </view>
+              </scroll-view>
+            </view>
+          </view>
+
+          <view v-if="loadStoreCategoryComplete">
+            <shoptheme6
+              v-if="commonTPL.tapindex == 3 && commonTPL.TemplateKey == 'shop6'"
+              :commonTPL="commonTPL"
+              @ckallPD6="ckallPD6"
+            >
+            </shoptheme6>
+            <scroll-view
+              v-else-if="commonTPL.tapindex == 3"
+              scroll-y="true"
+              @scrolltolower="scrollbottom"
+              @scrolltoupper="scrollTop"
+              @scroll="scrollView"
+              :class="[
+                'm-product-all u-pa',
+                commonTPL.istop ? 'u-patop' : 'u-pabtn',
+              ]"
+            >
+              <view
+                :class="[
+                  'm-product-list',
+                  'no-tap',
+                  commonTPL.viewtype == 1 ? 'fadeIn animated m-listv' : '',
+                ]"
+              >
+                <block v-for="(item, i) in commonTPL.pdlist" :key="i">
+                  <navigator
+                    :url="
+                      '/pages/product/detail?is_store_flag=' +
+                      commonTPL.isStoreFlag +
+                      '&pid=' +
+                      item.id
+                    "
+                    class="m-product-item"
+                    style="border-radius: 19rpx"
+                  >
+                    <view class="m-product-img">
+                      <image
+                        :src="item.ProductPic"
+                        mode="aspectFill"
+                        style="border-radius: 19rpx"
+                      />
+                    </view>
+                    <view class="m-product-info">
+                      <view class="m-product-name">
+                        <label>{{ item.SalesName }}</label>
+                      </view>
+                      <view class="m-product-price">
+                        <block v-if="item.ItemSalePrice">
+                          <label>{{ __("￥") }}</label
+                          >{{ number_format(item.ItemSalePrice, 2) }}
+                        </block>
+
+                        <block v-if="item.product_unit_points">
+                          <label style="margin: 0rpx 10rpx">+</label
+                          ><label style="font-size: 32rpx">{{
+                            number_format(item.product_unit_points)
+                          }}</label>
+                          <label>{{ __("积分") }}</label>
+                        </block>
+
+                        <block v-if="item.product_unit_sp">
+                          <label style="margin: 0rpx 10rpx">+</label
+                          ><label style="font-size: 32rpx">{{
+                            item.product_unit_sp
+                          }}</label>
+                          <label>{{ __("众宝") }}</label>
+                        </block>
+                      </view>
+                    </view>
+                  </navigator>
+                </block>
+              </view>
+              <view class="u-top-default">
+                <view
+                  class="u-view"
+                  @click="onViewType"
+                  style="line-height: 96rpx"
+                >
+                  <label
+                    :class="[
+                      'iconfont zc',
+                      commonTPL.viewtype == 1
+                        ? 'zc-viewlist'
+                        : 'zc-viewgallery',
+                    ]"
+                  ></label>
+                </view>
+                <view class="u-back hide" @click="retruntop">
+                  <label class="iconfont icon-fanhuidingbu"></label>
+                </view>
+              </view>
+              <view class="m-loading-box">
+                <block v-if="commonTPL.ispage">
+                  <view class="u-loadmore">
+                    <label class="u-loading"></label>
+                    <text class="u-loadmore-tips">{{ __("正在加载") }}</text>
+                  </view>
+                </block>
+                <block v-else>
+                  <view class="u-loadmore u-loadmore-line">
+                    <text class="u-loadmore-tips">{{
+                      __("没有更多数据啦！")
+                    }}</text>
+                  </view>
+                </block>
+              </view>
+            </scroll-view>
+          </view>
+
+          <view v-if="commonTPL.tapindex == 4" class="m-ShopProfile">
+            <view class="m-cells" style="">
+              <view class="shop-address-content">
+                <view
+                  class="shop-address-left-content"
+                  @click.stop="gotomap"
+                  :data-lat="commonTPL.shopInfo.store_latitude"
+                  :data-address="commonTPL.shopInfo.LegalAdress"
+                  :data-name="commonTPL.shopInfo.store_name"
+                  :data-lng="commonTPL.shopInfo.store_longitude"
+                >
+                  <label class="zc zc-shouhuodizhi address-icon"></label>
+                  <view class="address-info">
+                    <view class="address-item">
+                      <text style="font-weight: 700">{{
+                        commonTPL.shopInfo.LegalAdress
+                      }}</text>
+                      <text
+                        v-if="distance"
+                        @click.stop="gotomap"
+                        :data-lat="commonTPL.shopInfo.store_latitude"
+                        :data-address="commonTPL.shopInfo.LegalAdress"
+                        :data-name="commonTPL.shopInfo.store_name"
+                        :data-lng="commonTPL.shopInfo.store_longitude"
+                        style="color: #999; font-size: 20rpx"
+                        >{{ sprintf(__("距您 %s"), distance) }}</text
+                      >
+                    </view>
+                  </view>
+                </view>
+                <span>
+                  <image
+                    src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/phone_sp.png"
+                    style="width: 4rpx; height: 70rpx; border-radius: 24%"
+                  />
+                </span>
+
+                <view
+                  class="shop-address-right-content"
+                  @click="callPhone(commonTPL.shopInfo.LegalNumber)"
+                >
+                  <view class="shop-address-right-item">
+                    <image
+                      src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/phone.png"
+                      class="phone-img"
+                    />
+                    <text style="font-size: 12px">{{ __("联系商家") }}</text>
+                  </view>
+                </view>
+              </view>
+
+              <view class="m-cell">
+                <view class="m-cell-bd">
+                  <!-- <text>{{sprintf(__('店铺介绍：%s'), commonTPL.shopInfo.VendorInfo)}}</text> -->
+                  <wxParse
+                    :content="commonTPL.shopInfo.VendorInfo || '　'"
+                    :imageProp="{ padding: 0 }"
+                  />
+                </view>
+              </view>
+
+              <view class="m-cell" v-if="false" style="margin: 0 20rpx">
+                <view class="m-cell-bd">
+                  <swiper
+                    indicator-dots="true"
+                    autoplay="true"
+                    interval="3000"
+                    duration="300"
+                  >
+                    <swiper-item
+                      v-for="(item, ii) in commonTPL.shopInfo.info.store_slide"
+                      :key="ii"
+                      v-if="item.check"
+                    >
+                      <image
+                        lazy-load
+                        class="slide-image"
+                        mode="aspectFill"
+                        :src="item.img"
+                        :data-src="item.img"
+                        @click="previewProductImg"
+                      />
+                    </swiper-item>
+                  </swiper>
+                </view>
+              </view>
+            </view>
+          </view>
+
+          <!--评论-->
+          <view v-if="commonTPL.tapindex == 5">
+            <block v-if="comment_row.length > 0">
+              <view class="uni-padding-wrap">
+                <view class="uni-comment">
+                  <view
+                    v-for="(comment, cc) in comment_row"
+                    :key="cc"
+                    class="uni-comment-list"
+                    style="border-bottom: 1px solid #eee"
+                  >
+                    <view class="uni-comment-face">
+                      <image :src="comment.user_avatar" mode="widthFix"></image>
+                    </view>
+                    <view class="uni-comment-body">
+                      <view class="uni-comment-top">
+                        <text>{{ comment.user_name }}</text>
+                      </view>
+                      <view class="uni-comment-date">
+                        <text>{{ comment.comment_time }}</text>
+                      </view>
+                      <view class="uni-comment-content">{{
+                        comment.comment_content
+                      }}</view>
+                      <view
+                        v-if="comment.comment_image[0]"
+                        class="m-cell-bd"
+                        style="padding: 0; margin: 0; line-height: 1"
+                      >
+                        <view class="uni-uploader-body">
+                          <view class="uni-uploader__files">
+                            <block
+                              v-for="(image, ii) in comment.comment_image"
+                              :key="ii"
+                            >
+                              <view class="uni-uploader__file">
+                                <image
+                                  class="uni-uploader__img"
+                                  :src="comment.comment_image[ii]"
+                                ></image>
+                              </view>
+                            </block>
+                          </view>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+
+              <navigator
+                :url="'/pages/index/addcomment?is_store=' + options.store_id"
+                class="m-nullpage"
+                style="height: 286rpx; margin-top: 0%"
+              >
+                <view class="m-nullpage-middle">
+                  <label class="iconfont icon-xiecomment"></label>
+                  <view class="m-null-tip">
+                    <text>{{ __("我也说两句~") }}</text>
+                    <text>{{ __("去评论~") }}</text>
+                  </view>
+                </view>
+              </navigator>
+            </block>
+            <block v-else>
+              <navigator
+                :url="'/pages/index/addcomment?is_store=' + options.store_id"
+                class="m-nullpage"
+              >
+                <view class="m-nullpage-middle">
+                  <label class="iconfont icon-xiecomment"></label>
+                  <view class="m-null-tip">
+                    <text>{{ __("暂时没有评论哦~") }}</text>
+                    <text>{{ __("去评论~") }}</text>
+                  </view>
+                </view>
+              </navigator>
+            </block>
+          </view>
+
+          <!--评论-->
+      </view>
+    </view>
+
+    <MyTabbar current="5" :cartNum="cartNum" :storeId="shopInfo.store_id" :categoryId="shopInfo.category_id"></MyTabbar>
+  </view>
+</template>
+
+<script>
+// 仅仅作为初始化数据结构使用
+var thatProm = {
+  isStoreFlag: 1,
+  ProductInfo: {},
+  addCar: false,
+  count: 0,
+  windowHeight: 0,
+  categoryname: "",
+  click6: true,
+  cid: 0,
+  cartlist: {},
+  isdata: true,
+  select_cart_ids: [],
+  tapindex: 2,
+  viewtype: 1,
+  shopInfo: {
+    analytics: {
+      store_collect: 0,
+    },
+    store_slogan: "",
+    base: {},
+    info: {
+      store_slide: {},
+    },
+    VendorInfo: "　",
+  },
+  pdlist: [],
+  sort: 2,
+  ispage: true,
+  flag: true,
+  distance: 0,
+  istop: false,
+  TemplateKey: "",
+  smallCategory: [], // 店铺分类列表
+  loadStoreCategoryComplete: false, // 当前选中的店铺分类信息是否加载完成
+  currentCategoryId: 0, // 当前选中的店铺分类ID
+  currentCategoryName: "", // 当前选中的店铺分类名称
+  AdContent: {},
+  post: {
+    store_id: 0,
+    orderby: 1,
+    sort: 2,
+    isnew: false,
+    curpage: 1,
+  },
+  formdate: "",
+  pageId: 0,
+};
+import wxParse from "@/components/u-parse/u-parse.vue";
+import paymentBox from "../../components/payment-box.vue";
+
+import uniPopup from "../../components/uni-popup/uni-popup.vue";
+
+import shoptheme1 from "../../components/themes/shoptheme1.vue";
+import shoptheme2 from "../../components/themes/shoptheme2.vue";
+import shoptheme3 from "../../components/themes/shoptheme3.vue";
+import shoptheme4 from "../../components/themes/shoptheme4.vue";
+import shoptheme5 from "../../components/themes/shoptheme5.vue";
+import shoptheme6 from "../../components/themes/shoptheme6.vue";
+import diy from "../../components/themes/diy.vue";
+import uniTag from "@/components/uni-tag/uni-tag.vue";
+
+import favorite from "@/helpers/favorite";
+import MyTabbar from "./components/tabbar.vue";
+
+import { mapState, mapMutations } from "vuex";
+
+export default {
+  data: function () {
+    return {
+      options: {},
+      Coupons: [],
+      isCancelSuccess: true,
+      isCancel: true,
+      CouponAmount: 0,
+      user_is_new: 0,
+      pageId: "",
+      loadPageFlag: false,
+      PageContent: [],
+      BgConfig: {
+        BackgroundObj: {
+          type: 1,
+          bgColor: "#ffffff",
+          pathColor: "#f8f8f8",
+          path: "",
+        },
+      },
+      PageNav: {
+        window: {
+          navigationBarBackgroundColor: "#ffffff",
+          navigationBarTextStyle: "black",
+          navigationBarTitleText: "",
+          backgroundColor: "#f8f8f8",
+          backgroundTextStyle: "dark",
+        },
+      },
+      AdContent: {},
+      TemplateKey: "",
+      commonTPL: Object.assign({}, thatProm),
+      indexArray: [],
+      splist: [],
+      splistStr: [],
+      pid: 0,
+      index: 0,
+      shareImg: "",
+      shareTitle: "",
+      refresh: true,
+      ispage: true,
+      flag: true,
+      w: 0,
+      comment_row: [],
+      latitude: 0,
+      longitude: 0,
+      distance: 0,
+      discountNum: 0,
+      discountNNum: 0,
+      initThatProm: Object.assign({}, thatProm),
+      initPageData: null,
+      store_id: 1001,
+      store_info: null,
+      loadStoreInfoComplete: false, // 加载店铺基本信息完成
+      loadStoreConfigComplete: false, // 加载店铺配置信息完成
+      loadStoreCategoryComplete: false, // 加载店铺配置信息完成
+    };
+  },
+  computed: mapState([
+    "Config",
+    "StateCode",
+    "notice",
+    "plantformInfo",
+    "shopInfo",
+    "userInfo",
+    "hasLogin",
+    "cartNum",
+  ]),
+  components: {
+    shoptheme1,
+    shoptheme2,
+    shoptheme3,
+    shoptheme4,
+    shoptheme5,
+    shoptheme6,
+    diy,
+    uniTag,
+    wxParse,
+    MyTabbar,
+  },
+  onLoad: function (options) {
+    console.log("---------onLoad");
+    this.initStorePageData(options);
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    console.log("-------onShow");
+    this.reloadShop6Data();
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+    // 离开页面，注销事件
+    var that = this;
+
+    that.setData({
+      commonTPL: thatProm,
+    });
+
+    this.notice.removeNotification("RefreshProduct", that);
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: async function () {
+    this.reloadShop6Data();
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {},
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    // #ifdef MP-WEIXIN
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ["shareAppMessage", "shareTimeline"],
+    });
+    // #endif
+
+    return {
+      title: this.shareTitle,
+      imageUrl: this.shareImg,
+      path:
+        "/pagesub/index/store?store_id=" +
+        this.options.store_id +
+        "&uid=" +
+        this.userInfo.user_id,
+    };
+  },
+
+  /**
+   * 用户点击右上角分享朋友圈
+   */
+  onShareTimeline: function () {
+    return {
+      title: this.shareTitle,
+      query: {
+        uid: this.userInfo.user_id,
+        store_id: this.options.store_id,
+      },
+      imageUrl: this.shareImg,
+    };
+  },
+
+  /**
+   * 页面滚动触发事件的处理函数
+   */
+  onPageScroll: function () {},
+
+  methods: {
+    ...mapMutations([
+      "logout",
+      "getPlantformInfo",
+      "forceUserInfo",
+      "getStoreInfo",
+    ]),
+    ckLabel: function (e) {},
+    reloadShop6Data: function () {
+      let that = this;
+      if (this.$refs.shop6) {
+        this.$refs.shop6.reloadCategoryProduct();
+      }
+
+      that.$.stopPullDownRefresh();
+      that.$.hideLoading();
+    },
+    initStorePageData: function (options) {
+      var that = this;
+
+      that.$.showLoading();
+
+      //that.commonTPL 全局有效，状态保留了。 清除上次数据
+      that.$set(that.commonTPL, "istop", false);
+      that.$set(that.commonTPL, "pdlist", []);
+
+      this.setData({
+        options: options,
+        distance: options.d || 0,
+        store_id: options.store_id || 1001,
+      });
+
+      var w = that.$.getSystemInfoSync().windowWidth;
+      that.setData({
+        w: w,
+      });
+
+      this.notice.addNotification("RefreshProduct", that.RefreshProduct, that);
+
+      // 执行获取店铺信息的回调函数
+      this.getStoreInfo({
+        callback: async function (store) {
+          uni.setNavigationBarTitle({
+            title: store.store_name,
+          });
+
+          let tmp = Object.assign({}, store);
+          let coord = that.$.bMapTransQQMap(
+            tmp["store_longitude"],
+            tmp["store_latitude"]
+          );
+          tmp["store_longitude"] = coord.lng;
+          tmp["store_latitude"] = coord.lat;
+
+          let tmpThatProm = that.commonTPL;
+
+          tmpThatProm.shopInfo = tmp;
+
+          that.setData({
+            shareImg: store.WapLogoPath,
+            shareTitle: store.store_name,
+            store_info: store,
+            loadStoreInfoComplete: true,
+          });
+          try {
+            that.$set(
+              that.commonTPL,
+              "windowHeight",
+              that.$.getSystemInfoSync().windowHeight - 50
+            );
+          } catch (n) {
+            //console.log(" Do something when catch error", n)
+          }
+
+          //店铺分类数据
+          await that.getStoreConfig();
+          await that.getStoreCategory();
+
+          setTimeout(function () {
+            //初始化微信分享
+            let $title = store.store_name;
+            let $desc = "";
+            let $link = that.$.sprintf(
+              "%s/h5/pagesub/index/store?store_id=%s",
+              that.Config.SiteUrl,
+              options.store_id
+            );
+            let $img_url = store.WapLogoPath;
+
+            //初始化微信分享
+            that.$.wxShare($title, $desc, $link, $img_url);
+          }, 100);
+
+          that.$.getLocation({
+            type: "wgs84",
+            success: function (response) {
+              that.setData({
+                latitude: response.latitude,
+                longitude: response.longitude,
+              });
+              console.info("手机定位:");
+              console.info(JSON.stringify(response));
+
+              //计算距离  shopInfo
+
+              /**
+               * 计算两个经纬度的距离(米)
+               */
+              let getDistance = function (lat1, lng1, lat2, lng2) {
+                var radLat1 = (lat1 * Math.PI) / 180.0;
+                var radLat2 = (lat2 * Math.PI) / 180.0;
+                var a = radLat1 - radLat2;
+                var b = (lng1 * Math.PI) / 180.0 - (lng2 * Math.PI) / 180.0;
+                var s =
+                  2 *
+                  Math.asin(
+                    Math.sqrt(
+                      Math.pow(Math.sin(a / 2), 2) +
+                        Math.cos(radLat1) *
+                          Math.cos(radLat2) *
+                          Math.pow(Math.sin(b / 2), 2)
+                    )
+                  );
+                s = s * 6378.137; // EARTH_RADIUS;
+                s = Math.round(s * 10000) / 10;
+                return s;
+              };
+
+              let d = getDistance(
+                that.latitude,
+                that.longitude,
+                coord.lat,
+                coord.lng
+              );
+
+              if (d) {
+                d = that.$.distanceFormat(d || 0);
+              }
+
+              that.setData({
+                distance: d || 0,
+              });
+
+              that.getNearbylist();
+            },
+            fail: function () {
+              that.$.confirm("手机定位失败");
+
+              that.getNearbylist();
+            },
+          });
+        },
+        store_id: options.store_id,
+      });
+
+      //存入本地
+      uni.setStorageSync("store_id", options.store_id);
+    },
+
+    //读取diy内容
+    getDivModel: function () {
+      var that = this,
+        param = {
+          store_id: this.store_id,
+        };
+
+      that.$.request({
+        url: this.Config.URL.store.index_diy,
+        data: param,
+        loading: false,
+        success: function (data, status, msg, code) {
+          that.setData({
+            loadPageFlag: true,
+            pageId: data.page_id,
+            PageContent: that.$.parseJSON(data.page_code),
+            BgConfig: that.$.parseJSON(data.page_config),
+            shareImg: data.page_share_image,
+            shareTitle: data.page_share_title,
+          });
+        },
+      });
+    },
+
+    RefreshProduct: function (e) {
+      e
+        ? this.setData({
+            refresh: true,
+          })
+        : this.setData({
+            refresh: false,
+          });
+    },
+
+    //初始化数据，获取店铺分类
+    getStoreCategory: function () {
+      var that = this;
+
+      var param = {
+        store_id: that.store_id,
+      };
+
+      return new Promise((resolve, reject) => {
+        that.$.request({
+          url: that.Config.URL.store.product_category,
+          data: param,
+          loading: false,
+          ajaxCache: {
+            timeout: that.Config.CACHE_EXPIRE,
+          },
+          success: function (data, status, msg, code) {
+            let tmp = that.commonTPL;
+
+            that.$set(that.commonTPL, "smallCategory", data.leaf);
+            that.$set(that.commonTPL, "loadStoreCategoryComplete", true);
+            that.setData({
+              loadStoreCategoryComplete: true,
+            });
+
+            if (data.leaf.length > 0) {
+              that.$set(that.commonTPL, "cid", data.leaf[0].id);
+              that.$set(that.commonTPL, "currentCategoryId", data.leaf[0].id);
+              that.$set(
+                that.commonTPL,
+                "categoryname",
+                data.leaf[0].store_product_cat_name
+              );
+              that.$set(
+                that.commonTPL,
+                "currentCategoryName",
+                data.leaf[0].store_product_cat_name
+              );
+            }
+
+            if (1 == that.commonTPL.tapindex) {
+            } else if (2 == that.commonTPL.tapindex) {
+              that.listAllProduct();
+            } else if (3 == that.commonTPL.tapindex) {
+              that.listNewProduct();
+            } else if (4 == that.commonTPL.tapindex) {
+              that.getStoreData();
+            } else if (5 == that.commonTPL.tapindex) {
+            }
+
+            that.$.stopPullDownRefresh();
+            that.$.hideLoading();
+          },
+
+          fail: function (err) {},
+        });
+      });
+      //读取店铺商品分类 todo 根据需要读取。
+    },
+
+    // 点击推荐
+    clickRecommend: function () {
+      this.$set(this.commonTPL, "tapindex", 1);
+    },
+    clickListAllProduct: function () {
+      this.$set(this.commonTPL, "tapindex", 2);
+      this.listAllProduct();
+    },
+    // 全部商品
+    listAllProduct: function (e) {
+      let that = this;
+      that.$set(that.commonTPL, "pdlist", []);
+      // 使用了模块shopthemes，在模块中加载数据
+      if (that.commonTPL.TemplateKey === "shop6") {
+        that.$set(
+          that.commonTPL,
+          "post",
+          Object.assign({}, that.commonTPL.post, {
+            store_category_ids: that.commonTPL.currentCategoryId,
+            store_id: this.store_id,
+            orderby: 1,
+            sort: 2,
+            isnew: false,
+            curpage: 1,
+          })
+        );
+      } else {
+        that.$set(
+          that.commonTPL,
+          "post",
+          Object.assign({}, that.commonTPL.post, {
+            store_id: this.store_id,
+            orderby: 1,
+            sort: 2,
+            isnew: false,
+            curpage: 1,
+            is_activity: 3,
+          })
+        );
+        that.getProductList();
+      }
+    },
+    clickListNewProduct: function () {
+      let that = this;
+      that.$set(that.commonTPL, "tapindex", 3);
+
+      this.listNewProduct();
+    },
+    // 新品上市
+    listNewProduct: function () {
+      let that = this;
+      that.$set(that.commonTPL, "pdlist", []);
+
+      // 使用了模块shopthemes，在模块中加载数据
+      if (that.commonTPL.TemplateKey === "shop6") {
+        that.$set(
+          that.commonTPL,
+          "post",
+          Object.assign({}, that.commonTPL.post, {
+            store_category_ids: that.commonTPL.currentCategoryId,
+            store_id: this.store_id,
+            sidx: "product_add_time",
+            sord: "DESC",
+            orderby: 1,
+            sort: 2,
+            isnew: true,
+            curpage: 1,
+            store_id: this.store_id,
+          })
+        );
+      } else {
+        that.$set(
+          that.commonTPL,
+          "post",
+          Object.assign({}, that.commonTPL.post, {
+            store_id: that.store_id,
+            sidx: "product_add_time",
+            sord: "DESC",
+            orderby: 2,
+            sort: 2,
+            isnew: true,
+            curpage: 1,
+            is_activity: 1,
+          })
+        );
+        this.getProductList();
+      }
+    },
+    clickGetStoreData: function () {
+      let that = this;
+      that.$set(that.commonTPL, "tapindex", 4);
+
+      that.getStoreData();
+    },
+    // 查看店铺简介
+    getStoreData: function () {},
+    // 切换商品显示方式
+    onViewType: function () {
+      var that = this;
+
+      that.$set(
+        that.commonTPL,
+        "viewtype",
+        that.commonTPL.viewtype === 0 ? 1 : 0
+      );
+    },
+
+    clickSortBySaleNum: function () {
+      this.sortBySaleNum();
+    },
+    /**
+     * 销量排序
+     */
+    sortBySaleNum: function () {
+      var that = this;
+
+      that.$set(that.commonTPL, "pdlist", []);
+      that.$set(
+        that.commonTPL,
+        "post",
+        Object.assign({}, that.commonTPL.post, {
+          sidx: "product_sale_num",
+          sord: "DESC",
+          curpage: 1,
+        })
+      );
+
+      this.getProductList();
+    },
+
+    clickNewpd: function () {
+      this.newpd();
+    },
+
+    /**
+     * 新品排序
+     */
+    newpd: function () {
+      var that = this;
+
+      that.$set(that.commonTPL, "pdlist", []);
+      that.$set(
+        that.commonTPL,
+        "post",
+        Object.assign({}, that.commonTPL.post, {
+          sidx: "product_add_time",
+          sord: "DESC",
+          curpage: 1,
+        })
+      );
+
+      this.getProductList();
+    },
+
+    clickSortByPrice: function () {
+      this.sortByPrice();
+    },
+
+    /**
+     * 价格排序
+     */
+    sortByPrice: function () {
+      let that = this;
+
+      that.$set(
+        that.commonTPL,
+        "post",
+        Object.assign({}, that.commonTPL.post, {
+          sidx: "product_unit_price",
+          sord: that.commonTPL.sort === 1 ? "DESC" : "ASC",
+          curpage: 1,
+        })
+      );
+
+      that.$set(that.commonTPL, "sort", that.commonTPL.sort == 1 ? 2 : 1);
+      that.$set(that.commonTPL, "pdlist", []);
+
+      this.getProductList();
+    },
+    scrollbottom: function (e) {
+      let that = this;
+      if (that.commonTPL.flag) {
+        that.setData({
+          flag: false,
+        }),
+          clearTimeout(n);
+        var n = setTimeout(function () {
+          that.$set(
+            that.commonTPL,
+            "post",
+            Object.assign({}, that.commonTPL.post, {
+              curpage: that.commonTPL.post.curpage + 1,
+            })
+          );
+          that.getProductList();
+        }, 500);
+      }
+    },
+
+    getProductList: function () {
+      let that = this;
+
+      that.$set(that.commonTPL, "flag", false);
+
+      let params = Object.assign({}, that.commonTPL.post, {
+        isnew: that.commonTPL.post.isnew ? 1 : 0,
+        user_cart_quantity: that.commonTPL.TemplateKey === "shop6" ? 1 : 0,
+      });
+      that.$.request({
+        url: this.Config.URL.store.product,
+        loading: true,
+        data: params,
+        success: function (data, status, msg, code) {
+          for (var i = 0; i < data.items.length; i++) {
+            data.items[i]["id"] = data.items[i]["item_id"];
+            data.items[i]["DefaultProductSkuId"] = data.items[i]["item_id"];
+            data.items[i]["productName"] = data.items[i]["product_name"];
+            data.items[i]["SalesName"] = data.items[i]["product_name"];
+            data.items[i]["ProductPic"] = data.items[i]["product_image"];
+            data.items[i]["ItemSalePrice"] =
+              data.items[i]["product_unit_price"];
+            data.items[i]["SaleNum"] = data.items[i]["product_sale_num"];
+            data.items[i]["Stock"] = data.items[i]["product_quantity"];
+            data.items[i]["HasManualSku"] =
+              data.items[i]["item_color"].length > 1;
+            data.items[i]["DefaultProductSkuId"] = data.items[i]["item_id"];
+            //data.items[i]['user_cart_quantity'] = 1;
+          }
+
+          if (data.items.length > 0) {
+            if (that.commonTPL.post.curpage == 1 && data.items.length < 10) {
+              that.$set(that.commonTPL, "flag", false);
+              that.$set(that.commonTPL, "ispage", false);
+            } else {
+              that.$set(that.commonTPL, "flag", true);
+              that.$set(that.commonTPL, "ispage", true);
+            }
+            that.$set(
+              that.commonTPL,
+              "pdlist",
+              that.commonTPL.pdlist.concat(data.items)
+            );
+          } else {
+            that.$set(that.commonTPL, "flag", false);
+            that.$set(that.commonTPL, "ispage", false);
+          }
+        },
+      });
+    },
+    scrollView: function (e) {
+      let that = this;
+      if (e.detail.deltaY < -305) {
+        that.$set(that.commonTPL, "distance", e.detail.deltaY);
+        that.$set(that.commonTPL, "istop", true);
+      }
+    },
+    scrollTop: function () {
+      let that = this;
+
+      that.$set(that.commonTPL, "istop", false);
+    },
+    returnTop: function () {
+      let that = this;
+
+      that.$set(that.commonTPL, "distance", 0);
+    },
+    showSupplyProducts: function () {
+      this.$.gopage("/pages/product/list?store_type=2");
+    },
+    //店铺首页信息数据读取
+    getStoreConfig: function () {
+      var that = this;
+      var param = {
+        store_id: this.store_id,
+      };
+      return new Promise((resolve, reject) => {
+        that.$.request({
+          url: this.Config.URL.store.contents,
+          data: param,
+          loading: false,
+          success: function (data, status, msg, code) {
+            that.setData({
+              loadStoreConfigComplete: true,
+            });
+
+            that.$set(
+              that.commonTPL,
+              "TemplateKey",
+              data.store_template > 1000 || data.store_template === "shop7"
+                ? "shopdiy"
+                : data.store_template
+            );
+
+            if ("shopdiy" == that.commonTPL.TemplateKey) {
+            } else {
+              for (
+                var i = 0;
+                i < data.contents["F1ProductContents"].length;
+                i++
+              ) {
+                data.contents["F1ProductContents"][i]["ProductContentID"] =
+                  data.contents["F1ProductContents"][i]["item_id"];
+                data.contents["F1ProductContents"][i]["ProductName"] =
+                  data.contents["F1ProductContents"][i]["product_name"];
+                data.contents["F1ProductContents"][i]["Price"] =
+                  data.contents["F1ProductContents"][i]["product_unit_price"];
+                data.contents["F1ProductContents"][i]["ImagePath"] =
+                  data.contents["F1ProductContents"][i]["product_image"];
+                data.contents["F1ProductContents"][i]["TitleType"] =
+                  data.contents["F1TitleType"];
+              }
+
+              for (
+                var i = 0;
+                i < data.contents["F2ProductContents"].length;
+                i++
+              ) {
+                data.contents["F2ProductContents"][i]["ProductContentID"] =
+                  data.contents["F2ProductContents"][i]["item"];
+                data.contents["F2ProductContents"][i]["ProductName"] =
+                  data.contents["F2ProductContents"][i]["name"];
+                data.contents["F2ProductContents"][i]["Price"] =
+                  data.contents["F2ProductContents"][i]["product_unit_price"];
+                data.contents["F2ProductContents"][i]["ImagePath"] =
+                  data.contents["F2ProductContents"][i]["img"];
+                data.contents["F2ProductContents"][i]["TitleType"] =
+                  data.contents["F2TitleType"];
+                data.contents["F2ProductContents"][i]["ProductLinkUrl"] =
+                  data.contents["F2ProductContents"][i]["url"];
+              }
+
+              for (
+                var i = 0;
+                i < data.contents["F3ProductContents"].length;
+                i++
+              ) {
+                data.contents["F3ProductContents"][i]["ProductContentID"] =
+                  data.contents["F3ProductContents"][i]["item_id"];
+                data.contents["F3ProductContents"][i]["ProductName"] =
+                  data.contents["F3ProductContents"][i]["product_name"];
+                data.contents["F3ProductContents"][i]["Price"] =
+                  data.contents["F3ProductContents"][i]["product_unit_price"];
+                data.contents["F3ProductContents"][i]["ImagePath"] =
+                  data.contents["F3ProductContents"][i]["product_image"];
+                data.contents["F3ProductContents"][i]["TitleType"] =
+                  data.contents["F3ProductContents"][i]["title"];
+                data.contents["F3ProductContents"][i]["ProductLinkUrl"] =
+                  data.contents["F3ProductContents"][i]["link_url"];
+              }
+            }
+            that.$set(that.commonTPL, "AdContent", data.contents);
+
+            that.setData({
+              AdContent: data.contents,
+              TemplateKey: that.commonTPL.TemplateKey,
+              commonTPL: that.commonTPL,
+              discountNum: data.discount_num,
+              discountNNum: data.no_discount_num,
+            });
+            if (
+              that.commonTPL.smallCategory.length > 0 &&
+              that.commonTPL.TemplateKey == "shop6"
+            ) {
+              that.$set(that.commonTPL, "tapindex", 2);
+            }
+
+            that.commonTPL.TemplateKey == "shopdiy" && that.getDivModel(); //shopdiy用户自定义UI
+            resolve("success");
+          },
+          complete: function (res, status) {},
+        });
+      });
+      //读取店铺商品分类
+    },
+
+    sao: function () {
+      let that = this;
+      that.$.scanCode({
+        success: function (e) {
+          var t = e.result.split("=");
+          t.length > 2 || t.length < 2
+            ? that.$.alert("无法识别")
+            : t[0] == "productId"
+            ? that.$.isNull(t[1])
+              ? that.$.alert("无法识别")
+              : that.$.navigateTo("/pages/product/detail?pid=" + t[1])
+            : t[0] == "eventId"
+            ? that.$.isNull(t[1])
+              ? that.$.alert("无法识别")
+              : that.$.navigateTo(
+                  "../activitycheckin/activitycheckin?eventId=" + t[1]
+                )
+            : that.$.alert("无法识别");
+        },
+        fail: function (e) {
+          that.$.alert("无法识别");
+        },
+      });
+    },
+    doReceive: function () {
+      this.cancel(), this.userReceiveCoupon();
+    },
+    cancel: function () {
+      this.setData({
+        isCancel: false,
+      });
+    },
+    cancelsuccess: function () {
+      this.setData({
+        isCancelSuccess: true,
+      });
+    },
+    userReceiveCoupon: function () {
+      var e = {
+          CouponIds: "",
+
+          user_is_new: this.user_is_new,
+        },
+        that = this;
+      that.$.xsr(that.$.makeUrl(userapi.UserReceiveCoupon, e), function (e) {
+        e.Code == 0
+          ? that.setData({
+              isCancelSuccess: false,
+              Coupons: e.Info,
+            })
+          : that.$.alert(e.Msg);
+      });
+    },
+
+    onLikeStore: function (store_id) {
+      favorite.onLikeStore(store_id, (flag) => {
+        this.commonTPL.shopInfo.analytics.store_collect = 1;
+        this.commonTPL.shopInfo.analytics.store_favorite_num++;
+      });
+    },
+
+    onUnlikeStore: function (store_id) {
+      favorite.onUnlikeStore(store_id, (flag) => {
+        this.commonTPL.shopInfo.analytics.store_collect = 0;
+        this.commonTPL.shopInfo.analytics.store_favorite_num--;
+      });
+    },
+    previewProductImg: function (e) {
+      var that = this,
+        n = [];
+      for (var r in this.commonTPL.shopInfo.info.store_slide) {
+        if (this.ProductInfo.productPicList[r].check) {
+          n.push(this.ProductInfo.productPicList[r].img);
+        }
+      }
+
+      var i = e.target.dataset.src;
+
+      that.$.previewImage({
+        current: i,
+        urls: n,
+      });
+    },
+    callPhone: function (e) {
+      var that = this;
+      uni.makePhoneCall({ phoneNumber: e + "" });
+    },
+    gotomap: function (e) {
+      var that = this;
+      that.$.openLocation({
+        latitude: parseFloat(e.currentTarget.dataset.lat),
+        longitude: parseFloat(e.currentTarget.dataset.lng),
+        name: e.currentTarget.dataset.name,
+        address: e.currentTarget.dataset.address,
+        scale: 28,
+      });
+    },
+    getNearbylist: function () {
+      var post = this.post;
+      var that = this;
+
+      var params = {
+        lat: that.latitude,
+        lng: that.longitude,
+        store_id: that.options.store_id,
+        is_store: 1,
+        city: that.$.getStorageSync("city"),
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+@import "../../styles/_variables";
+@import "../../styles/layout.scss";
+@import "../../styles/store_themes.scss";
+@import "../../styles/store_tpl.scss";
+
+.inddex-store-container {
+  padding-bottom: 64px;
+}
+
+.inddex-store-container {
+  .shop-address-content {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 20px 10px 0 10px;
+
+    .shop-address-left-content {
+      display: flex;
+      align-items: center;
+      position: relative;
+      width: 78%;
+      justify-content: space-around;
+
+      .address-icon {
+        width: 45px;
+        height: 45px;
+        text-align: center;
+        color: red;
+      }
+
+      .address-info {
+        max-width: 75%;
+        line-height: 44rpx;
+
+        .address-item {
+          display: flex;
+          flex-flow: column;
+          font-size: 12px;
+        }
+      }
+    }
+
+    .shop-address-right-content {
+      width: 20%;
+      height: 40px;
+      text-align: center;
+
+      .shop-address-right-item {
+        display: flex;
+        flex-flow: column;
+        align-items: center;
+        line-height: 40px;
+
+        .phone-img {
+          width: 22px;
+          height: 22px;
+        }
+      }
+    }
+  }
+}
+
+.tag-view {
+  position: absolute;
+  bottom: 20rpx;
+  right: 20rpx;
+  z-index: 100;
+  display: inline-flex;
+}
+
+.tag-mark-right {
+  border-top-left-radius: 15px;
+  border-bottom-left-radius: 15px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.m-shopinfo {
+  width: 556rpx;
+  display: flex;
+  flex-flow: column;
+
+  .iconfont {
+    color: #fff;
+    margin-left: 0px;
+
+    &.icon-start {
+      top: 0;
+      margin-left: 4rpx;
+    }
+
+    &.sel {
+      color: $default-skin-bg;
+    }
+  }
+
+  .service-star-box {
+    background-color: gray;
+    line-height: 32rpx;
+    height: 32rpx;
+    border-radius: 20rpx;
+
+    font-size: 12px;
+    color: white;
+    width: 240rpx;
+    padding: 0rpx 6rpx;
+    margin-left: 0rpx;
+    float: right;
+    text-align: center;
+
+    display: flex;
+
+    .m-startBox {
+      display: inline-block;
+      line-height: 30rpx;
+      height: 30rpx;
+      font-size: 20rpx;
+    }
+    .m-startBox label {
+      font-size: 20rpx;
+    }
+  }
+}
+
+.u-pa .m-product-list {
+  padding-top: calc(82rpx) !important;
+}
+
+.uni-comment-date {
+  font-size: 10px;
+  color: #999999;
+}
+
+.t {
+  width: 90rpx;
+  height: 90rpx;
+  /* left: 0px; */
+  position: absolute;
+  top: 18rpx;
+}
+
+.uni-uploader__img {
+  display: block;
+  width: 182rpx;
+  height: 182rpx;
+}
+
+.uni-uploader__file {
+  margin: 9rpx;
+  width: 182rpx;
+  height: 182rpx;
+}
+</style>
diff --git a/pagesub/index/store.vue b/pagesub/index/store.vue
index 965152e..56478f2 100644
--- a/pagesub/index/store.vue
+++ b/pagesub/index/store.vue
@@ -11,152 +11,91 @@
         </view>
         <view class="m-shopinfo">
           <view style="display: flex">
-            <view
-              style="
+            <view style="
                 font-size: 36rpx;
                 color: #fff;
                 flex: 1;
                 height: 40rpx;
                 line-height: 40rpx;
-              "
-              >{{ store_info.store_name }}</view
-            >
+              ">{{ store_info.store_name }}</view>
             <view class="iconfont icon-qijiandian" v-if="false"></view>
             <view class="service-star-box" v-if="store_info.store_star_num > 0">
               <view>{{ __("综合体验") }}</view>
-              <view
-                class="m-startBox"
-                v-for="(itemIndex, ii) in [1, 2, 3, 4, 5]"
-                :key="ii"
-                :class="[
-                  'iconfont',
-                  'icon-start',
-                  itemIndex <= store_info.store_star_num ? 'sel' : '',
-                ]"
-              >
+              <view class="m-startBox" v-for="(itemIndex, ii) in [1, 2, 3, 4, 5]" :key="ii" :class="[
+                'iconfont',
+                'icon-start',
+                itemIndex <= store_info.store_star_num ? 'sel' : '',
+              ]">
               </view>
             </view>
           </view>
           <view style="margin-left: 20rpx" v-if="false">{{
             store_info.store_grade_name
           }}</view>
-          <text
-            style="
+          <text style="
               width: 56%;
               display: -webkit-box;
               -webkit-box-orient: vertical;
               -webkit-line-clamp: 2;
               overflow: hidden;
-            "
-            v-if="store_info.store_slogan != ''"
-            >{{ sprintf(__("公告：%s"), store_info.store_slogan) }}</text
-          >
+            " v-if="store_info.store_slogan != ''">{{ sprintf(__("公告：%s"), store_info.store_slogan) }}</text>
         </view>
         <view class="tag-view">
-          <uni-tag
-            :text="__('已收藏')"
-            mark="right"
-            type="gray"
-            size="normal"
-            inverted="1"
-            circle="true"
-            data-type="groupbuy"
-            v-if="store_info.analytics.store_collect"
-            @click="onUnlikeStore(store_info.store_id)"
-          ></uni-tag>
+          <uni-tag :text="__('已收藏')" mark="right" type="gray" size="normal" inverted="1" circle="true"
+            data-type="groupbuy" v-if="store_info.analytics.store_collect"
+            @click="onUnlikeStore(store_info.store_id)"></uni-tag>
 
-          <uni-tag
-            :text="__('收藏')"
-            mark="right"
-            type="lancerdt"
-            size="normal"
-            inverted="1"
-            circle="true"
-            data-type="groupbuy"
-            v-if="store_info.analytics.store_collect < 1"
-            @click="onLikeStore(store_info.store_id)"
-          ></uni-tag>
+          <uni-tag :text="__('收藏')" mark="right" type="lancerdt" size="normal" inverted="1" circle="true"
+            data-type="groupbuy" v-if="store_info.analytics.store_collect < 1"
+            @click="onLikeStore(store_info.store_id)"></uni-tag>
 
-          <uni-tag
-            :text="
-              sprintf(__(' %d 次'), store_info.analytics.store_favorite_num)
-            "
-            mark="true"
-            type="lancerdt"
-            size="normal"
-            inverted="1"
-            circle="true"
-            data-type="groupbuy"
-          ></uni-tag>
+          <uni-tag :text="sprintf(__(' %d 次'), store_info.analytics.store_favorite_num)
+            " mark="true" type="lancerdt" size="normal" inverted="1" circle="true" data-type="groupbuy"></uni-tag>
         </view>
       </view>
 
       <view v-if="loadStoreConfigComplete">
-        <diy
-          v-if="commonTPL.TemplateKey == 'shopdiy'"
-          :BgConfig="BgConfig"
-          :PageContent="PageContent"
-          :pageId="pageId"
-          :PageNav="PageNav"
-          :StoreInfo="commonTPL.shopInfo"
-          :loadPageFlag="loadPageFlag"
-        ></diy>
+        <diy v-if="commonTPL.TemplateKey == 'shopdiy'" :BgConfig="BgConfig" :PageContent="PageContent" :pageId="pageId"
+          :PageNav="PageNav" :StoreInfo="commonTPL.shopInfo" :loadPageFlag="loadPageFlag"></diy>
 
-        <block v-if="commonTPL.TemplateKey != 'shopdiy'">
+        <block v-else>
           <view class="g-flex m-ba-tab" v-if="commonTPL.TemplateKey != ''">
-            <view
-              :class="[
-                'g-flex-item',
-                commonTPL.tapindex == 1 ? 'm-ba-item-select' : '',
-              ]"
-              @click="clickRecommend"
-              v-if="commonTPL.TemplateKey != 'shop6'"
-            >
-              <!--我加的判断-->
+            <view :class="[
+              'g-flex-item',
+              commonTPL.tapindex == 1 ? 'm-ba-item-select' : '',
+            ]" @click="clickRecommend" v-if="commonTPL.TemplateKey != 'shop6'">
               <view class="m-ba-icon">
                 <label class="iconfont icon-discount"></label>
               </view>
               <view>{{ __("推荐") }}</view>
             </view>
-            <view
-              :class="[
-                'g-flex-item',
-                commonTPL.tapindex == 2 ? 'm-ba-item-select' : '',
-              ]"
-              @click="clickListAllProduct"
-            >
+            <view :class="[
+              'g-flex-item',
+              commonTPL.tapindex == 2 ? 'm-ba-item-select' : '',
+            ]" @click="clickListAllProduct">
               <view class="m-ba-icon">{{ commonTPL.shopInfo.AllProduct }}</view>
               <view>{{ __("全部商品") }}</view>
             </view>
-            <view
-              :class="[
-                'g-flex-item',
-                commonTPL.tapindex == 3 ? 'm-ba-item-select' : '',
-              ]"
-              @click="clickListNewProduct"
-            >
+            <view :class="[
+              'g-flex-item',
+              commonTPL.tapindex == 3 ? 'm-ba-item-select' : '',
+            ]" @click="clickListNewProduct">
               <view class="m-ba-icon">{{ commonTPL.shopInfo.NewProduct }}</view>
               <view>{{ __("上新") }}</view>
             </view>
-            <view
-              :class="[
-                'g-flex-item',
-                commonTPL.tapindex == 4 ? 'm-ba-item-select' : '',
-              ]"
-              @click="clickGetStoreData"
-            >
+            <view :class="[
+              'g-flex-item',
+              commonTPL.tapindex == 4 ? 'm-ba-item-select' : '',
+            ]" @click="clickGetStoreData">
               <view class="m-ba-icon">
                 <label class="iconfont icon-store"></label>
               </view>
               <view>{{ __("店铺简介") }}</view>
             </view>
-            <view
-              :class="[
-                'g-flex-item',
-                commonTPL.tapindex == 4 ? 'm-ba-item-select hide' : 'hide',
-              ]"
-              @click="showSupplyProducts"
-            >
+            <view :class="[
+              'g-flex-item',
+              commonTPL.tapindex == 4 ? 'm-ba-item-select hide' : 'hide',
+            ]" @click="showSupplyProducts">
               <view class="m-ba-icon">
                 <label class="iconfont icon-store"></label>
               </view>
@@ -164,129 +103,73 @@
             </view>
           </view>
 
-          <shoptheme1
-            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop1'"
-            :commonTPL="commonTPL"
-          >
+          <shoptheme1 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop1'" :commonTPL="commonTPL">
           </shoptheme1>
-          <shoptheme2
-            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop2'"
-            :commonTPL="commonTPL"
-          >
+          <shoptheme2 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop2'" :commonTPL="commonTPL">
           </shoptheme2>
-          <shoptheme3
-            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop3'"
-            :commonTPL="commonTPL"
-          >
+          <shoptheme3 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop3'" :commonTPL="commonTPL">
           </shoptheme3>
-          <shoptheme4
-            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop4'"
-            :commonTPL="commonTPL"
-          >
+          <shoptheme4 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop4'" :commonTPL="commonTPL">
           </shoptheme4>
-          <shoptheme5
-            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop5'"
-            :commonTPL="commonTPL"
-          >
+          <shoptheme5 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop5'" :commonTPL="commonTPL">
           </shoptheme5>
-          <shoptheme6
-            v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop6'"
-            :commonTPL="commonTPL"
-          >
+          <shoptheme6 v-if="commonTPL.tapindex == 1 && commonTPL.TemplateKey == 'shop6'" :commonTPL="commonTPL">
           </shoptheme6>
 
           <view v-if="loadStoreCategoryComplete">
-            <shoptheme6
-              v-if="commonTPL.tapindex == 2 && commonTPL.TemplateKey == 'shop6'"
-              :commonTPL="commonTPL"
-              ref="shop6"
-            ></shoptheme6>
+            <shoptheme6 v-if="commonTPL.tapindex == 2 && commonTPL.TemplateKey == 'shop6'" :commonTPL="commonTPL"
+              ref="shop6"></shoptheme6>
             <view v-else-if="commonTPL.tapindex == 2" class="m-scroll-box">
-              <scroll-view
-                scroll-y="true"
-                @scrolltolower="scrollbottom"
-                @scroll="scrollView"
-                @scrolltoupper="scrollTop"
-                class="m-product-all"
-                :class="[
+              <scroll-view scroll-y="true" @scrolltolower="scrollbottom" @scroll="scrollView" @scrolltoupper="scrollTop"
+                class="m-product-all" :class="[
                   'm-product-all',
                   'u-pa',
                   commonTPL.istop ? 'u-patop' : 'u-pabtn',
-                ]"
-              >
+                ]">
                 <view class="m-tab">
                   <view class="m-navbar">
-                    <view
-                      class="m-navbar-item"
-                      :class="[
-                        'm-navbar-item',
-                        commonTPL.post.orderby == 'product_sale_num'
-                          ? 'm-navbar-item-on'
-                          : '',
-                      ]"
-                      @click="clickSortBySaleNum"
-                    >
+                    <view class="m-navbar-item" :class="[
+                      'm-navbar-item',
+                      commonTPL.post.orderby == 'product_sale_num'
+                        ? 'm-navbar-item-on'
+                        : '',
+                    ]" @click="clickSortBySaleNum">
                       {{ __("销量") }}
                     </view>
-                    <view
-                      class="m-navbar-item"
-                      :class="[
-                        'm-navbar-item',
-                        commonTPL.post.orderby == 'product_add_time'
-                          ? 'm-navbar-item-on'
-                          : '',
-                      ]"
-                      @click="clickNewpd"
-                    >
+                    <view class="m-navbar-item" :class="[
+                      'm-navbar-item',
+                      commonTPL.post.orderby == 'product_add_time'
+                        ? 'm-navbar-item-on'
+                        : '',
+                    ]" @click="clickNewpd">
                       {{ __("新品") }}
                     </view>
-                    <view
-                      class="m-navbar-item"
-                      :class="[
-                        'm-navbar-item',
-                        commonTPL.post.orderby == 'product_unit_price'
-                          ? 'm-navbar-item-on'
-                          : '',
-                      ]"
-                      @click="clickSortByPrice"
-                    >
+                    <view class="m-navbar-item" :class="[
+                      'm-navbar-item',
+                      commonTPL.post.orderby == 'product_unit_price'
+                        ? 'm-navbar-item-on'
+                        : '',
+                    ]" @click="clickSortByPrice">
                       <label class="m-sort">
                         {{ __("价格") }}
-                        <image
-                          :src="
-                            'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/' +
-                            (commonTPL.sort == 1 ? 'sort-desc' : 'sort-asc') +
-                            '.png'
-                          "
-                        />
+                        <image :src="'https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/' +
+                          (commonTPL.sort == 1 ? 'sort-desc' : 'sort-asc') +
+                          '.png'
+                          " />
                       </label>
                     </view>
                   </view>
                 </view>
-                <view
-                  :class="[
-                    'm-product-list',
-                    commonTPL.viewtype == 1 ? 'fadeIn animated m-listv' : '',
-                  ]"
-                >
-                  <navigator
-                    v-for="(item, i) in commonTPL.pdlist"
-                    :key="i"
-                    :url="
-                      '/pages/product/detail?is_store_flag=' +
-                      commonTPL.isStoreFlag +
-                      '&pid=' +
-                      item.id
-                    "
-                    class="m-product-item"
-                    style="border-radius: 19rpx"
-                  >
+                <view :class="[
+                  'm-product-list',
+                  commonTPL.viewtype == 1 ? 'fadeIn animated m-listv' : '',
+                ]">
+                  <view v-for="(item, i) in commonTPL.pdlist" :key="i" @click="goShopDetail('/pages/product/detail?is_store_flag=' +
+                    commonTPL.isStoreFlag +
+                    '&pid=' +
+                    item.id)" class="m-product-item" style="border-radius: 19rpx">
                     <view class="m-product-img">
-                      <image
-                        :src="item.ProductPic"
-                        mode="aspectFill"
-                        style="border-radius: 19rpx"
-                      />
+                      <image :src="item.ProductPic" mode="aspectFill" style="border-radius: 19rpx" />
                     </view>
                     <view class="m-product-info">
                       <view class="m-product-name">
@@ -294,39 +177,39 @@
                       </view>
                       <view class="m-product-price">
                         <block v-if="item.ItemSalePrice">
-                          <label>{{ __("￥") }}</label
-                          >{{ number_format(item.ItemSalePrice, 2) }}
+                          <label>{{ __("￥")
+                          }}{{ number_format(item.ItemSalePrice, 2) }}</label>
                         </block>
 
+                        <view @click.stop="addCart(item, $event)">
+                          <uni-icons type="plus-filled" size="30" color="#fe411b"></uni-icons>
+                        </view>
+
                         <block v-if="item.product_unit_points">
-                          <label style="margin: 0rpx 10rpx">+</label
-                          ><label style="font-size: 32rpx">{{
+                          <label style="margin: 0rpx 10rpx">+</label><label style="font-size: 32rpx">{{
                             number_format(item.product_unit_points)
                           }}</label>
                           <label>{{ __("积分") }}</label>
                         </block>
 
                         <block v-if="item.product_unit_sp">
-                          <label style="margin: 0rpx 10rpx">+</label
-                          ><label style="font-size: 32rpx">{{
+                          <label style="margin: 0rpx 10rpx">+</label><label style="font-size: 32rpx">{{
                             item.product_unit_sp
                           }}</label>
                           <label>{{ __("众宝") }}</label>
                         </block>
                       </view>
                     </view>
-                  </navigator>
+                  </view>
                 </view>
                 <view class="u-top-default">
                   <view class="u-view" @click="onViewType">
-                    <label
-                      :class="[
-                        'iconfont zc',
-                        commonTPL.viewtype == 1
-                          ? 'zc-viewlist'
-                          : 'zc-viewgallery',
-                      ]"
-                    ></label>
+                    <label :class="[
+                      'iconfont zc',
+                      commonTPL.viewtype == 1
+                        ? 'zc-viewlist'
+                        : 'zc-viewgallery',
+                    ]"></label>
                   </view>
                   <view class="u-back hide" @click="retruntop">
                     <label class="iconfont icon-fanhuidingbu"></label>
@@ -352,47 +235,26 @@
           </view>
 
           <view v-if="loadStoreCategoryComplete">
-            <shoptheme6
-              v-if="commonTPL.tapindex == 3 && commonTPL.TemplateKey == 'shop6'"
-              :commonTPL="commonTPL"
-              @ckallPD6="ckallPD6"
-            >
+            <shoptheme6 v-if="commonTPL.tapindex == 3 && commonTPL.TemplateKey == 'shop6'" :commonTPL="commonTPL"
+              @ckallPD6="ckallPD6">
             </shoptheme6>
-            <scroll-view
-              v-else-if="commonTPL.tapindex == 3"
-              scroll-y="true"
-              @scrolltolower="scrollbottom"
-              @scrolltoupper="scrollTop"
-              @scroll="scrollView"
-              :class="[
+            <scroll-view v-else-if="commonTPL.tapindex == 3" scroll-y="true" @scrolltolower="scrollbottom"
+              @scrolltoupper="scrollTop" @scroll="scrollView" :class="[
                 'm-product-all u-pa',
                 commonTPL.istop ? 'u-patop' : 'u-pabtn',
-              ]"
-            >
-              <view
-                :class="[
-                  'm-product-list',
-                  'no-tap',
-                  commonTPL.viewtype == 1 ? 'fadeIn animated m-listv' : '',
-                ]"
-              >
+              ]">
+              <view :class="[
+                'm-product-list',
+                'no-tap',
+                commonTPL.viewtype == 1 ? 'fadeIn animated m-listv' : '',
+              ]">
                 <block v-for="(item, i) in commonTPL.pdlist" :key="i">
-                  <navigator
-                    :url="
-                      '/pages/product/detail?is_store_flag=' +
-                      commonTPL.isStoreFlag +
-                      '&pid=' +
-                      item.id
-                    "
-                    class="m-product-item"
-                    style="border-radius: 19rpx"
-                  >
+                  <view @click="goShopDetail('/pages/product/detail?is_store_flag=' +
+                    commonTPL.isStoreFlag +
+                    '&pid=' +
+                    item.id)" class="m-product-item" style="border-radius: 19rpx">
                     <view class="m-product-img">
-                      <image
-                        :src="item.ProductPic"
-                        mode="aspectFill"
-                        style="border-radius: 19rpx"
-                      />
+                      <image :src="item.ProductPic" mode="aspectFill" style="border-radius: 19rpx" />
                     </view>
                     <view class="m-product-info">
                       <view class="m-product-name">
@@ -400,44 +262,35 @@
                       </view>
                       <view class="m-product-price">
                         <block v-if="item.ItemSalePrice">
-                          <label>{{ __("￥") }}</label
-                          >{{ number_format(item.ItemSalePrice, 2) }}
+                          <label>{{ __("￥") }}{{ number_format(item.ItemSalePrice, 2) }}</label>
                         </block>
 
                         <block v-if="item.product_unit_points">
-                          <label style="margin: 0rpx 10rpx">+</label
-                          ><label style="font-size: 32rpx">{{
+                          <label style="margin: 0rpx 10rpx">+</label><label style="font-size: 32rpx">{{
                             number_format(item.product_unit_points)
                           }}</label>
                           <label>{{ __("积分") }}</label>
                         </block>
 
                         <block v-if="item.product_unit_sp">
-                          <label style="margin: 0rpx 10rpx">+</label
-                          ><label style="font-size: 32rpx">{{
+                          <label style="margin: 0rpx 10rpx">+</label><label style="font-size: 32rpx">{{
                             item.product_unit_sp
                           }}</label>
                           <label>{{ __("众宝") }}</label>
                         </block>
                       </view>
                     </view>
-                  </navigator>
+                  </view>
                 </block>
               </view>
               <view class="u-top-default">
-                <view
-                  class="u-view"
-                  @click="onViewType"
-                  style="line-height: 96rpx"
-                >
-                  <label
-                    :class="[
-                      'iconfont zc',
-                      commonTPL.viewtype == 1
-                        ? 'zc-viewlist'
-                        : 'zc-viewgallery',
-                    ]"
-                  ></label>
+                <view class="u-view" @click="onViewType" style="line-height: 96rpx">
+                  <label :class="[
+                    'iconfont zc',
+                    commonTPL.viewtype == 1
+                      ? 'zc-viewlist'
+                      : 'zc-viewgallery',
+                  ]"></label>
                 </view>
                 <view class="u-back hide" @click="retruntop">
                   <label class="iconfont icon-fanhuidingbu"></label>
@@ -464,49 +317,33 @@
           <view v-if="commonTPL.tapindex == 4" class="m-ShopProfile">
             <view class="m-cells" style="">
               <view class="shop-address-content">
-                <view
-                  class="shop-address-left-content"
-                  @click.stop="gotomap"
-                  :data-lat="commonTPL.shopInfo.store_latitude"
-                  :data-address="commonTPL.shopInfo.LegalAdress"
-                  :data-name="commonTPL.shopInfo.store_name"
-                  :data-lng="commonTPL.shopInfo.store_longitude"
-                >
+                <view class="shop-address-left-content" @click.stop="gotomap"
+                  :data-lat="commonTPL.shopInfo.store_latitude" :data-address="commonTPL.shopInfo.LegalAdress"
+                  :data-name="commonTPL.shopInfo.store_name" :data-lng="commonTPL.shopInfo.store_longitude">
                   <label class="zc zc-shouhuodizhi address-icon"></label>
                   <view class="address-info">
                     <view class="address-item">
                       <text style="font-weight: 700">{{
                         commonTPL.shopInfo.LegalAdress
                       }}</text>
-                      <text
-                        v-if="distance"
-                        @click.stop="gotomap"
-                        :data-lat="commonTPL.shopInfo.store_latitude"
-                        :data-address="commonTPL.shopInfo.LegalAdress"
-                        :data-name="commonTPL.shopInfo.store_name"
-                        :data-lng="commonTPL.shopInfo.store_longitude"
-                        style="color: #999; font-size: 20rpx"
-                        >{{ sprintf(__("距您 %s"), distance) }}</text
-                      >
+                      <text v-if="distance" @click.stop="gotomap" :data-lat="commonTPL.shopInfo.store_latitude"
+                        :data-address="commonTPL.shopInfo.LegalAdress" :data-name="commonTPL.shopInfo.store_name"
+                        :data-lng="commonTPL.shopInfo.store_longitude" style="color: #999; font-size: 20rpx">{{
+                          sprintf(__("距您 %s"), distance) }}</text>
                     </view>
                   </view>
                 </view>
                 <span>
                   <image
                     src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/phone_sp.png"
-                    style="width: 4rpx; height: 70rpx; border-radius: 24%"
-                  />
+                    style="width: 4rpx; height: 70rpx; border-radius: 24%" />
                 </span>
 
-                <view
-                  class="shop-address-right-content"
-                  @click="callPhone(commonTPL.shopInfo.LegalNumber)"
-                >
+                <view class="shop-address-right-content" @click="callPhone(commonTPL.shopInfo.LegalNumber)">
                   <view class="shop-address-right-item">
                     <image
                       src="https://media-mall-prod-1259811287.cos.ap-guangzhou.myqcloud.com/static/xcxfile/appicon/images/phone.png"
-                      class="phone-img"
-                    />
+                      class="phone-img" />
                     <text style="font-size: 12px">{{ __("联系商家") }}</text>
                   </view>
                 </view>
@@ -514,35 +351,16 @@
 
               <view class="m-cell">
                 <view class="m-cell-bd">
-                  <!-- <text>{{sprintf(__('店铺介绍：%s'), commonTPL.shopInfo.VendorInfo)}}</text> -->
-                  <wxParse
-                    :content="commonTPL.shopInfo.VendorInfo || '　'"
-                    :imageProp="{ padding: 0 }"
-                  />
+                  <wxParse :content="commonTPL.shopInfo.VendorInfo || '　'" :imageProp="{ padding: 0 }" />
                 </view>
               </view>
 
               <view class="m-cell" v-if="false" style="margin: 0 20rpx">
                 <view class="m-cell-bd">
-                  <swiper
-                    indicator-dots="true"
-                    autoplay="true"
-                    interval="3000"
-                    duration="300"
-                  >
-                    <swiper-item
-                      v-for="(item, ii) in commonTPL.shopInfo.info.store_slide"
-                      :key="ii"
-                      v-if="item.check"
-                    >
-                      <image
-                        lazy-load
-                        class="slide-image"
-                        mode="aspectFill"
-                        :src="item.img"
-                        :data-src="item.img"
-                        @click="previewProductImg"
-                      />
+                  <swiper indicator-dots="true" autoplay="true" interval="3000" duration="300">
+                    <swiper-item v-for="(item, ii) in commonTPL.shopInfo.info.store_slide" :key="ii" v-if="item.check">
+                      <image lazy-load class="slide-image" mode="aspectFill" :src="item.img" :data-src="item.img"
+                        @click="previewProductImg" />
                     </swiper-item>
                   </swiper>
                 </view>
@@ -550,17 +368,12 @@
             </view>
           </view>
 
-          <!--评论-->
           <view v-if="commonTPL.tapindex == 5">
             <block v-if="comment_row.length > 0">
               <view class="uni-padding-wrap">
                 <view class="uni-comment">
-                  <view
-                    v-for="(comment, cc) in comment_row"
-                    :key="cc"
-                    class="uni-comment-list"
-                    style="border-bottom: 1px solid #eee"
-                  >
+                  <view v-for="(comment, cc) in comment_row" :key="cc" class="uni-comment-list"
+                    style="border-bottom: 1px solid #eee">
                     <view class="uni-comment-face">
                       <image :src="comment.user_avatar" mode="widthFix"></image>
                     </view>
@@ -574,22 +387,13 @@
                       <view class="uni-comment-content">{{
                         comment.comment_content
                       }}</view>
-                      <view
-                        v-if="comment.comment_image[0]"
-                        class="m-cell-bd"
-                        style="padding: 0; margin: 0; line-height: 1"
-                      >
+                      <view v-if="comment.comment_image[0]" class="m-cell-bd"
+                        style="padding: 0; margin: 0; line-height: 1">
                         <view class="uni-uploader-body">
                           <view class="uni-uploader__files">
-                            <block
-                              v-for="(image, ii) in comment.comment_image"
-                              :key="ii"
-                            >
+                            <block v-for="(image, ii) in comment.comment_image" :key="ii">
                               <view class="uni-uploader__file">
-                                <image
-                                  class="uni-uploader__img"
-                                  :src="comment.comment_image[ii]"
-                                ></image>
+                                <image class="uni-uploader__img" :src="comment.comment_image[ii]"></image>
                               </view>
                             </block>
                           </view>
@@ -600,11 +404,8 @@
                 </view>
               </view>
 
-              <navigator
-                :url="'/pages/index/addcomment?is_store=' + options.store_id"
-                class="m-nullpage"
-                style="height: 286rpx; margin-top: 0%"
-              >
+              <navigator :url="'/pages/index/addcomment?is_store=' + options.store_id" class="m-nullpage"
+                style="height: 286rpx; margin-top: 0%">
                 <view class="m-nullpage-middle">
                   <label class="iconfont icon-xiecomment"></label>
                   <view class="m-null-tip">
@@ -615,10 +416,7 @@
               </navigator>
             </block>
             <block v-else>
-              <navigator
-                :url="'/pages/index/addcomment?is_store=' + options.store_id"
-                class="m-nullpage"
-              >
+              <navigator :url="'/pages/index/addcomment?is_store=' + options.store_id" class="m-nullpage">
                 <view class="m-nullpage-middle">
                   <label class="iconfont icon-xiecomment"></label>
                   <view class="m-null-tip">
@@ -629,11 +427,11 @@
               </navigator>
             </block>
           </view>
-
-          <!--评论-->
         </block>
       </view>
     </view>
+
+    <MyTabbar current="1" :cartNum="cartNum" :storeId="shopInfo.store_id" :categoryId="shopInfo.category_id"></MyTabbar>
   </view>
 </template>
 
@@ -686,6 +484,7 @@ var thatProm = {
   formdate: "",
   pageId: 0,
 };
+
 import wxParse from "@/components/u-parse/u-parse.vue";
 import paymentBox from "../../components/payment-box.vue";
 
@@ -699,6 +498,7 @@ import shoptheme5 from "../../components/themes/shoptheme5.vue";
 import shoptheme6 from "../../components/themes/shoptheme6.vue";
 import diy from "../../components/themes/diy.vue";
 import uniTag from "@/components/uni-tag/uni-tag.vue";
+import MyTabbar from "./components/tabbar.vue";
 
 import favorite from "@/helpers/favorite";
 
@@ -771,6 +571,7 @@ export default {
     "shopInfo",
     "userInfo",
     "hasLogin",
+    "cartNum",
   ]),
   components: {
     shoptheme1,
@@ -782,7 +583,16 @@ export default {
     diy,
     uniTag,
     wxParse,
+    MyTabbar,
   },
+
+  onBackPress({ from }) {
+    console.log("=======", from);
+    if (from == "backbutton") {
+      uni.switchTab({ url: "/pages/index/index" });
+    }
+  },
+
   onLoad: function (options) {
     this.initStorePageData(options);
   },
@@ -818,7 +628,7 @@ export default {
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {},
+  onReachBottom: function () { },
 
   /**
    * 用户点击右上角分享
@@ -859,7 +669,7 @@ export default {
   /**
    * 页面滚动触发事件的处理函数
    */
-  onPageScroll: function () {},
+  onPageScroll: function () { },
 
   methods: {
     ...mapMutations([
@@ -868,7 +678,46 @@ export default {
       "forceUserInfo",
       "getStoreInfo",
     ]),
-    ckLabel: function (e) {},
+
+    goShopDetail(url) {
+      this.$.gopage(url)
+    },
+
+    async addCart(item, event) {
+      var that = this;
+      var params = {
+        item_id: item.item_id,
+        proName: item.product_name,
+        cart_quantity: 1,
+        activity_id: 0,
+        SKU_Id: item.item_id,
+      };
+
+      event.stopPropagation()
+
+      await this.$store.dispatch(`addCart`, {
+        params: params,
+        callback: (data, status, msg, code) => {
+          if (status == 200) {
+            if (data.item_quantity != 0) {
+              that.$.alert(that.__("添加购物车成功"), function () { }, 400);
+            } else {
+              uni.showToast({
+                title: "亲~商品没有库存啦！",
+                icon: "error",
+                duration: 500,
+              });
+              // that.$.alert(that.__("商品没有库存了"), function () {}, 500);
+            }
+
+            if (that.plantformInfo.prodcut_addcart_flag) {
+              that.$store.dispatch(`getCartList`, function (data) { });
+            }
+          }
+        },
+      });
+    },
+    ckLabel: function (e) { },
     reloadShop6Data: function () {
       let that = this;
       if (this.$refs.shop6) {
@@ -979,9 +828,9 @@ export default {
                   Math.asin(
                     Math.sqrt(
                       Math.pow(Math.sin(a / 2), 2) +
-                        Math.cos(radLat1) *
-                          Math.cos(radLat2) *
-                          Math.pow(Math.sin(b / 2), 2)
+                      Math.cos(radLat1) *
+                      Math.cos(radLat2) *
+                      Math.pow(Math.sin(b / 2), 2)
                     )
                   );
                 s = s * 6378.137; // EARTH_RADIUS;
@@ -1047,11 +896,11 @@ export default {
     RefreshProduct: function (e) {
       e
         ? this.setData({
-            refresh: true,
-          })
+          refresh: true,
+        })
         : this.setData({
-            refresh: false,
-          });
+          refresh: false,
+        });
     },
 
     //初始化数据，获取店铺分类
@@ -1108,7 +957,7 @@ export default {
             that.$.hideLoading();
           },
 
-          fail: function (err) {},
+          fail: function (err) { },
         });
       });
       //读取店铺商品分类 todo 根据需要读取。
@@ -1209,7 +1058,7 @@ export default {
       that.getStoreData();
     },
     // 查看店铺简介
-    getStoreData: function () {},
+    getStoreData: function () { },
     // 切换商品显示方式
     onViewType: function () {
       var that = this;
@@ -1483,7 +1332,7 @@ export default {
             that.commonTPL.TemplateKey == "shopdiy" && that.getDivModel(); //shopdiy用户自定义UI
             resolve("success");
           },
-          complete: function (res, status) {},
+          complete: function (res, status) { },
         });
       });
       //读取店铺商品分类
@@ -1497,16 +1346,16 @@ export default {
           t.length > 2 || t.length < 2
             ? that.$.alert("无法识别")
             : t[0] == "productId"
-            ? that.$.isNull(t[1])
-              ? that.$.alert("无法识别")
-              : that.$.navigateTo("/pages/product/detail?pid=" + t[1])
-            : t[0] == "eventId"
-            ? that.$.isNull(t[1])
-              ? that.$.alert("无法识别")
-              : that.$.navigateTo(
-                  "../activitycheckin/activitycheckin?eventId=" + t[1]
-                )
-            : that.$.alert("无法识别");
+              ? that.$.isNull(t[1])
+                ? that.$.alert("无法识别")
+                : that.$.navigateTo("/pages/product/detail?pid=" + t[1])
+              : t[0] == "eventId"
+                ? that.$.isNull(t[1])
+                  ? that.$.alert("无法识别")
+                  : that.$.navigateTo(
+                    "../activitycheckin/activitycheckin?eventId=" + t[1]
+                  )
+                : that.$.alert("无法识别");
         },
         fail: function (e) {
           that.$.alert("无法识别");
@@ -1528,17 +1377,17 @@ export default {
     },
     userReceiveCoupon: function () {
       var e = {
-          CouponIds: "",
+        CouponIds: "",
 
-          user_is_new: this.user_is_new,
-        },
+        user_is_new: this.user_is_new,
+      },
         that = this;
       that.$.xsr(that.$.makeUrl(userapi.UserReceiveCoupon, e), function (e) {
         e.Code == 0
           ? that.setData({
-              isCancelSuccess: false,
-              Coupons: e.Info,
-            })
+            isCancelSuccess: false,
+            Coupons: e.Info,
+          })
           : that.$.alert(e.Msg);
       });
     },
@@ -1602,13 +1451,29 @@ export default {
 };
 </script>
 
-
-<style lang="scss">
+<style lang="scss" scoped>
 @import "../../styles/_variables";
 @import "../../styles/layout.scss";
 @import "../../styles/store_themes.scss";
 @import "../../styles/store_tpl.scss";
 
+.u-pabtn {
+  position: static;
+}
+
+.m-product-info {
+  width: auto;
+
+  .m-product-price {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+
+.inddex-store-container {
+  padding-bottom: 64px;
+}
+
 .inddex-store-container {
   .shop-address-content {
     display: flex;
@@ -1718,6 +1583,7 @@ export default {
       height: 30rpx;
       font-size: 20rpx;
     }
+
     .m-startBox label {
       font-size: 20rpx;
     }
@@ -1725,7 +1591,7 @@ export default {
 }
 
 .u-pa .m-product-list {
-  padding-top: calc(82rpx) !important;
+  padding-top: calc(90rpx) !important;
 }
 
 .uni-comment-date {
@@ -1782,4 +1648,8 @@ export default {
   width: 182rpx;
   height: 182rpx;
 }
+
+.u-top-default{
+  bottom: 150px;
+}
 </style>