diff --git a/api/store.js b/api/store.js
index 40beae6..d175644 100644
--- a/api/store.js
+++ b/api/store.js
@@ -35,6 +35,14 @@ export function getProducts(q) {
 		login: false
 	});
 }
+/*
+ * 积分商品列表
+ * */
+export function getProductsIntegral(q) {
+	return request.get("/products/integral", q, {
+		login: false
+	});
+}
 
 /*
  * 购物车数量
diff --git a/config/index.js b/config/index.js
index 1a4dbba..8629e6a 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,7 +1,8 @@
 
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
- // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
+ export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api';
+//  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 1b41e3d..551a177 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -2,9 +2,7 @@
   <view :class="productConClass">
     <view v-if="storeInfo.id">
       <!-- 轮播图 -->
-      <product-con-swiper
-        :img-urls="storeInfo.sliderImageArr"
-      ></product-con-swiper>
+      <product-con-swiper :img-urls="storeInfo.sliderImageArr"></product-con-swiper>
 
       <!-- 商品信息描述 -->
       <view class="wrapper">
@@ -14,21 +12,11 @@
             <text class="num">{{
               attr.productSelect.price || storeInfo.price
             }}</text>
-            <text
-              class="vip-money"
-              v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0"
-              >￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text
-            >
-            <image
-              src="@/static/images/vip.png"
-              class="image"
-              v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0"
-            />
+            <text class="vip-money"
+              v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0">￥{{ attr.productSelect.vipPrice || storeInfo.vipPrice }}</text>
+            <image src="@/static/images/vip.png" class="image" v-if="storeInfo.vipPrice && storeInfo.vipPrice > 0" />
           </view>
-          <view
-            class="iconfont icon-fenxiang"
-            @click="listenerActionSheet"
-          ></view>
+          <view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
         </view>
         <view class="introduce">{{ storeInfo.storeName }}</view>
         <view class="label acea-row row-between-wrapper">
@@ -36,19 +24,11 @@
           <text>库存:{{ storeInfo.stock }}{{ storeInfo.unitName }}</text>
           <text>销量:{{ storeInfo.sales }}{{ storeInfo.unitName }}</text>
         </view>
-        <view
-          class="coupon acea-row row-between-wrapper"
-          @click="couponTap"
-          v-if="couponList.length"
-        >
+        <view class="coupon acea-row row-between-wrapper" @click="couponTap" v-if="couponList.length">
           <text class="hide line1">
             <text>优惠券：</text>
-            <text
-              class="activity"
-              v-for="(item, couponListEq) in couponList"
-              :key="couponListEq"
-              >满{{ item.useMinPrice }}减{{ item.couponPrice }}</text
-            >
+            <text class="activity" v-for="(item, couponListEq) in couponList"
+              :key="couponListEq">满{{ item.useMinPrice }}减{{ item.couponPrice }}</text>
           </text>
           <view class="iconfont icon-jiantou"></view>
         </view>
@@ -63,10 +43,7 @@
       </div>
 
       <!-- 规格 -->
-      <view
-        class="attribute acea-row row-between-wrapper"
-        @click="selecAttrTap"
-      >
+      <view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
         <view>
           <text>{{ attrTxt }}：</text>
           <text class="atterTxt">{{ attrValue }}</text>
@@ -90,22 +67,14 @@
             </view>
             <view class="text">
               <view class="name line1">{{ systemStore.name }}</view>
-              <view
-                class="address acea-row row-middle"
-                @click="showChang(systemStore)"
-              >
+              <view class="address acea-row row-middle" @click="showChang(systemStore)">
                 <text class="addressTxt">{{ systemStore.address }}</text>
                 <text class="iconfont icon-youjian"></text>
               </view>
             </view>
             <view class="addressBox">
-              <a
-                class="iconfont icon-dadianhua01 font-color-red phone"
-                @click="telPhone(systemStore.phone)"
-              ></a>
-              <view class="addressTxt corlor-yshop"
-                >距离{{ systemStore.distance }}千米</view
-              >
+              <a class="iconfont icon-dadianhua01 font-color-red phone" @click="telPhone(systemStore.phone)"></a>
+              <view class="addressTxt corlor-yshop">距离{{ systemStore.distance }}千米</view>
             </view>
           </view>
         </view>
@@ -181,11 +150,7 @@
           <view class="iconfont icon-shoucang"></view>
           <text>收藏</text>
         </view>
-        <view
-          @click="goShoppingCart()"
-          v-if="animated"
-          class="item animated bounceIn"
-        >
+        <view @click="goShoppingCart()" v-if="animated" class="item animated bounceIn">
           <view class="iconfont icon-gouwuche1">
             <text class="num bg-color-red" v-if="CartCount > 0">{{
               CartCount
@@ -214,23 +179,12 @@
       <!-- 优惠券 -->
       <CouponPop v-on:changeFun="changeFun" :coupon="coupon"></CouponPop>
       <!-- 商品规格弹窗 -->
-      <ProductWindow
-        v-on:changeFun="changeFun"
-        :attr="attr"
-        :cartNum="cart_num"
-      ></ProductWindow>
+      <ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cart_num"></ProductWindow>
       <!-- 分享海报 -->
-      <StorePoster
-        v-on:setPosterImageStatus="setPosterImageStatus"
-        :posterImageStatus="posterImageStatus"
-        :posterData="posterData"
-        :goodId="id"
-      ></StorePoster>
+      <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
+        :posterData="posterData" :goodId="id"></StorePoster>
       <!-- 分享弹窗 -->
-      <ShareInfo
-        v-on:setShareInfoStatus="setShareInfoStatus"
-        :shareInfoStatus="shareInfoStatus"
-      ></ShareInfo>
+      <ShareInfo v-on:setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></ShareInfo>
 
       <view class="generate-posters acea-row row-middle on" v-if="posters">
         <view class="item" @click="setPosterImageStatus">
@@ -244,12 +198,7 @@
           <view>生成海报</view>
         </view>
       </view>
-      <view
-        class="mask"
-        @touchmove.prevent
-        @click="listenerActionClose"
-        v-show="posters"
-      ></view>
+      <view class="mask" @touchmove.prevent @click="listenerActionClose" v-show="posters"></view>
       <view class="posterCanvasWarp">
         <canvas class="posterCanvas" canvas-id="myCanvas"></canvas>
       </view>
@@ -258,579 +207,601 @@
 </template>
 
 <script>
-// import { swiper, swiperSlide } from "vue-awesome-swiper";
+  // import { swiper, swiperSlide } from "vue-awesome-swiper";
 
-import ProductConSwiper from "@/components/ProductConSwiper";
-import UserEvaluation from "@/components/UserEvaluation";
-import CouponPop from "@/components/CouponPop";
-import ProductWindow from "@/components/ProductWindow";
-import StorePoster from "@/components/StorePoster";
-import ShareInfo from "@/components/ShareInfo";
-import {
-  getProductDetail,
-  postCartAdd,
-  getCartCount,
-  getProductCode,
-} from "@/api/store";
-import {
-  getCoupon,
-  getCollectAdd,
-  getCollectDel,
-  getUserInfo,
-} from "@/api/user";
-import cookie from "@/utils/store/cookie";
-import {
-  isWeixin,
-  PosterCanvas,
-  handleQrCode,
-  handleUrlParam,
-  getCurrentPageUrlWithArgs,
-} from "@/utils";
-import { wechatEvevt } from "@/libs/wechat";
-import { imageBase64 } from "@/api/public";
-import { mapGetters } from "vuex";
+  import ProductConSwiper from "@/components/ProductConSwiper";
+  import UserEvaluation from "@/components/UserEvaluation";
+  import CouponPop from "@/components/CouponPop";
+  import ProductWindow from "@/components/ProductWindow";
+  import StorePoster from "@/components/StorePoster";
+  import ShareInfo from "@/components/ShareInfo";
+  import {
+    getProductDetail,
+    postCartAdd,
+    getCartCount,
+    getProductCode,
+  } from "@/api/store";
+  import {
+    getCoupon,
+    getCollectAdd,
+    getCollectDel,
+    getUserInfo,
+  } from "@/api/user";
+  import cookie from "@/utils/store/cookie";
+  import {
+    isWeixin,
+    PosterCanvas,
+    handleQrCode,
+    handleUrlParam,
+    getCurrentPageUrlWithArgs,
+  } from "@/utils";
+  import {
+    wechatEvevt
+  } from "@/libs/wechat";
+  import {
+    imageBase64
+  } from "@/api/public";
+  import {
+    mapGetters
+  } from "vuex";
 
-export default {
-  name: "GoodsCon",
-  components: {
-    // swiper,
-    // swiperSlide,
-    ProductConSwiper,
-    UserEvaluation,
-    CouponPop,
-    ProductWindow,
-    StorePoster,
-    ShareInfo,
-  },
-  data: function () {
-    return {
-      shareInfoStatus: false,
-      weixinStatus: false,
-      mapShow: false,
-      mapKey: "",
-      posterData: {
-        image: "",
-        title: "",
-        price: "",
-        code: "",
-      },
-      posterImageStatus: false,
-      animated: false,
-      coupon: {
-        coupon: false,
-        list: [],
-      },
-      attr: {
-        cartAttr: false,
-        productAttr: [],
-        productSelect: {},
-      },
-      isOpen: false, //是否打开属性组件
-      productValue: [],
-      id: 0,
-      storeInfo: {},
-      couponList: [],
-      attrTxt: "请选择",
-      attrValue: "",
-      cart_num: 1, //购买数量
-      replyCount: "",
-      replyChance: "",
-      reply: [],
-      priceName: 0,
-      CartCount: 0,
-      posters: false,
-      banner: [{}, {}],
-      swiperRecommend: {
-        pagination: {
-          el: ".swiper-pagination",
-          clickable: true,
-        },
-        autoplay: false,
-        loop: false,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      goodList: [],
-      systemStore: {},
-      qqmapsdk: null,
-      productConClass: "product-con",
-      tempName: "全国包邮",
-    };
-  },
-  computed: mapGetters(["isLogin", "location"]),
-  mounted: function () {
-    this.$store.commit("get_to", "goodcon");
-    let url = handleQrCode();
-    if (!url) {
-      url = handleUrlParam(getCurrentPageUrlWithArgs());
-    }
-    this.coupons();
-    if (url && url.id) {
-      this.id = url.id;
-      let urlSpread = parseInt(url.spread);
-      if (urlSpread) {
-        cookie.set("spread", urlSpread);
-      }
-    } else {
-      this.id = this._route.query.id;
-    }
-    this.productCon();
-    this.setOpenShare();
-  },
-  watch: {
-    posterImageStatus(status) {
-      console.log(status);
-      if (status) {
-        this.productConClass = "noscroll product-con";
-      } else {
-        this.productConClass = "product-con";
-      }
+  export default {
+    name: "GoodsCon",
+    components: {
+      // swiper,
+      // swiperSlide,
+      ProductConSwiper,
+      UserEvaluation,
+      CouponPop,
+      ProductWindow,
+      StorePoster,
+      ShareInfo,
     },
-  },
-  methods: {
-    onShareAppMessage: function () {
+    data: function () {
       return {
-        title: this.storeInfo.storeName,
-        imageUrl: this.storeInfo.image,
-        path:
-          "pages/shop/GoodsCon/index?id=" +
-          this.storeInfo.id +
-          "&spread=" +
-          uni.getStorageSync("uid") +
-          "&pageType=good&codeType=routine",
-        success(res) {
-          uni.showToast({
-            title: "分享成功",
-          });
+        shareInfoStatus: false,
+        weixinStatus: false,
+        mapShow: false,
+        mapKey: "",
+        posterData: {
+          image: "",
+          title: "",
+          price: "",
+          code: "",
         },
-        fail(res) {
-          uni.showToast({
-            title: "分享失败",
-            icon: "none",
-          });
+        posterImageStatus: false,
+        animated: false,
+        coupon: {
+          coupon: false,
+          list: [],
         },
-      };
-    },
-    goHome() {
-      this.$yrouter.switchTab("/pages/home/index");
-    },
-    goShoppingCart() {
-      this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
-    },
-    goCustomerList() {
-      this.$yrouter.push({
-        path: "/pages/user/CustomerList/index",
-      });
-    },
-    goStoreList() {
-      this.$yrouter.push({
-        path: "/pages/shop/StoreList/index",
-      });
-    },
-    goEvaluateList(id) {
-      this.$yrouter.push({
-        path: "/pages/shop/EvaluateList/index",
-        query: {
-          id,
+        attr: {
+          cartAttr: false,
+          productAttr: [],
+          productSelect: {},
         },
-      });
-    },
-    telPhone(phoneNumber) {
-      uni.makePhoneCall({
-        phoneNumber: phoneNumber,
-        fail() {
-          console.log("取消拨打");
+        isOpen: false, //是否打开属性组件
+        productValue: [],
+        id: 0,
+        storeInfo: {},
+        couponList: [],
+        attrTxt: "请选择",
+        attrValue: "",
+        cart_num: 1, //购买数量
+        replyCount: "",
+        replyChance: "",
+        reply: [],
+        priceName: 0,
+        CartCount: 0,
+        posters: false,
+        banner: [{}, {}],
+        swiperRecommend: {
+          pagination: {
+            el: ".swiper-pagination",
+            clickable: true,
+          },
+          autoplay: false,
+          loop: false,
+          speed: 1000,
+          observer: true,
+          observeParents: true,
         },
-      });
-    },
-    showChang: function (data) {
-      this.$yrouter.push({
-        path: "/pages/map/index",
-        query: data,
-      });
-    },
-    updateTitle() {
-      // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
-    },
-    setShareInfoStatus: function () {
-      this.shareInfoStatus = !this.shareInfoStatus;
-      this.posters = false;
+        goodList: [],
+        systemStore: {},
+        qqmapsdk: null,
+        productConClass: "product-con",
+        tempName: "全国包邮",
+        isIntegral: "false"
+      };
     },
-    shareCode: function () {
-      var that = this;
-      getProductCode(that.id).then((res) => {
-        that.posterData.code = res.data.code;
-        that.listenerActionSheet();
-      });
+    computed: mapGetters(["isLogin", "location"]),
+    mounted: function () {
+      this.$store.commit("get_to", "goodcon");
+      let url = handleQrCode();
+      if (!url) {
+        url = handleUrlParam(getCurrentPageUrlWithArgs());
+      }
+      this.coupons();
+      if (url && url.id) {
+        this.id = url.id;
+        let urlSpread = parseInt(url.spread);
+        if (urlSpread) {
+          cookie.set("spread", urlSpread);
+        }
+      } else {
+        this.id = this._route.query.id;
+      }
+      this.productCon();
+      this.setOpenShare();
     },
-    setPosterImageStatus: function () {
-      this.posterImageStatus = !this.posterImageStatus;
-      this.posters = false;
+    watch: {
+      posterImageStatus(status) {
+        console.log(status);
+        if (status) {
+          this.productConClass = "noscroll product-con";
+        } else {
+          this.productConClass = "product-con";
+        }
+      },
     },
-    //产品详情接口；
-    productCon: function () {
-      let that = this;
-      let from = this.location;
-      if (this.$deviceType == "app") {
-        from.from = "app";
-      }
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      getProductDetail(that.id, from)
-        .then((res) => {
-          res.data.storeInfo.description = res.data.storeInfo.description.replace(
-            /\<img/gi,
-            '<img style="max-width:100%;height:auto;"'
+    methods: {
+      onShareAppMessage: function () {
+        return {
+          title: this.storeInfo.storeName,
+          imageUrl: this.storeInfo.image,
+          path: "pages/shop/GoodsCon/index?id=" +
+            this.storeInfo.id +
+            "&spread=" +
+            uni.getStorageSync("uid") +
+            "&pageType=good&codeType=routine",
+          success(res) {
+            uni.showToast({
+              title: "分享成功",
+            });
+          },
+          fail(res) {
+            uni.showToast({
+              title: "分享失败",
+              icon: "none",
+            });
+          },
+        };
+      },
+      goHome() {
+        this.$yrouter.switchTab("/pages/home/index");
+      },
+      goShoppingCart() {
+        this.$yrouter.switchTab("/pages/shop/ShoppingCart/index");
+      },
+      goCustomerList() {
+        this.$yrouter.push({
+          path: "/pages/user/CustomerList/index",
+        });
+      },
+      goStoreList() {
+        this.$yrouter.push({
+          path: "/pages/shop/StoreList/index",
+        });
+      },
+      goEvaluateList(id) {
+        this.$yrouter.push({
+          path: "/pages/shop/EvaluateList/index",
+          query: {
+            id,
+          },
+        });
+      },
+      telPhone(phoneNumber) {
+        uni.makePhoneCall({
+          phoneNumber: phoneNumber,
+          fail() {
+            console.log("取消拨打");
+          },
+        });
+      },
+      showChang: function (data) {
+        this.$yrouter.push({
+          path: "/pages/map/index",
+          query: data,
+        });
+      },
+      updateTitle() {
+        // document.title = this.storeInfo.storeName || this.$yroute.meta.title;
+      },
+      setShareInfoStatus: function () {
+        this.shareInfoStatus = !this.shareInfoStatus;
+        this.posters = false;
+      },
+      shareCode: function () {
+        var that = this;
+        getProductCode(that.id).then((res) => {
+          that.posterData.code = res.data.code;
+          that.listenerActionSheet();
+        });
+      },
+      setPosterImageStatus: function () {
+        this.posterImageStatus = !this.posterImageStatus;
+        this.posters = false;
+      },
+      //产品详情接口；
+      productCon: function () {
+        let that = this;
+        let from = this.location;
+        if (this.$deviceType == "app") {
+          from.from = "app";
+        }
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        getProductDetail(that.id, from)
+          .then((res) => {
+            res.data.storeInfo.description = res.data.storeInfo.description.replace(
+              /\<img/gi,
+              '<img style="max-width:100%;height:auto;"'
+            );
+            that.$set(that, "storeInfo", res.data.storeInfo);
+            // 给 attr 赋值，将请求回来的规格赋值给 attr
+            that.$set(that.attr, "productAttr", res.data.productAttr);
+            that.$set(that, "productValue", res.data.productValue);
+            that.$set(that, "replyCount", res.data.replyCount);
+            that.$set(that, "replyChance", res.data.replyChance);
+            that.reply = res.data.reply ? [res.data.reply] : [];
+            that.$set(that, "reply", that.reply);
+            that.$set(that, "priceName", res.data.priceName);
+            that.$set(that, "tempName", res.data.tempName);
+            that.posterData.image = that.storeInfo.image;
+            if (that.storeInfo.storeName.length > 30) {
+              that.posterData.title =
+                that.storeInfo.storeName.substring(0, 30) + "...";
+            } else {
+              that.posterData.title = that.storeInfo.storeName;
+            }
+            that.posterData.price = that.storeInfo.price;
+            that.posterData.code = that.storeInfo.codeBase;
+            that.systemStore = res.data.systemStore;
+            let good_list = res.data.goodList || [];
+            let goodArray = [];
+            let count = Math.ceil(good_list.length / 6);
+            for (let i = 0; i < count; i++) {
+              var list = good_list.slice(i * 6, 6);
+              if (list.length)
+                goodArray.push({
+                  list: list,
+                });
+            }
+            that.mapKay = res.data.mapKay;
+            that.$set(that, "goodList", goodArray);
+            that.updateTitle();
+            that.DefaultSelect();
+            that.getCartCount();
+          })
+          .catch((err) => {
+            uni.showToast({
+              title: err.msg || err.response.data.msg || err.response.data.message,
+              icon: "none",
+              duration: 2000,
+            });
+          })
+          .finally(() => {
+            uni.hideLoading();
+          });
+      },
+      //默认选中属性；
+      DefaultSelect: function () {
+        let productAttr = this.attr.productAttr;
+        let value = [];
+        for (let i = 0; i < productAttr.length; i++) {
+          this.$set(productAttr[i], "index", 0);
+          value.push(productAttr[i].attrValueArr[0]);
+        }
+        //sort();排序函数:数字-英文-汉字；
+        let productSelect = this.productValue[value.sort().join(",")];
+        if (productSelect && productAttr.length) {
+          this.$set(
+            this.attr.productSelect,
+            "store_name",
+            this.storeInfo.storeName
           );
-          that.$set(that, "storeInfo", res.data.storeInfo);
-          // 给 attr 赋值，将请求回来的规格赋值给 attr
-          that.$set(that.attr, "productAttr", res.data.productAttr);
-          that.$set(that, "productValue", res.data.productValue);
-          that.$set(that, "replyCount", res.data.replyCount);
-          that.$set(that, "replyChance", res.data.replyChance);
-          that.reply = res.data.reply ? [res.data.reply] : [];
-          that.$set(that, "reply", that.reply);
-          that.$set(that, "priceName", res.data.priceName);
-          that.$set(that, "tempName", res.data.tempName);
-          that.posterData.image = that.storeInfo.image;
-          if (that.storeInfo.storeName.length > 30) {
-            that.posterData.title =
-              that.storeInfo.storeName.substring(0, 30) + "...";
+          this.$set(this.attr.productSelect, "image", productSelect.image);
+          this.$set(this.attr.productSelect, "price", productSelect.price);
+          this.$set(this.attr.productSelect, "stock", productSelect.stock);
+          this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this.attr.productSelect, "cart_num", 1);
+          this.$set(this, "attrValue", value.sort().join(","));
+          this.$set(this, "attrTxt", "已选择");
+        } else if (!productSelect && productAttr.length) {
+          this.$set(
+            this.attr.productSelect,
+            "store_name",
+            this.storeInfo.storeName
+          );
+          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+          this.$set(this.attr.productSelect, "stock", 0);
+          this.$set(this.attr.productSelect, "unique", "");
+          this.$set(this.attr.productSelect, "cart_num", 0);
+          this.$set(this, "attrValue", "");
+          this.$set(this, "attrTxt", "请选择");
+        } else if (!productSelect && !productAttr.length) {
+          this.$set(
+            this.attr.productSelect,
+            "store_name",
+            this.storeInfo.storeName
+          );
+          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+          this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
+          this.$set(
+            this.attr.productSelect,
+            "unique",
+            this.storeInfo.unique || ""
+          );
+          this.$set(this.attr.productSelect, "cart_num", 1);
+          this.$set(this, "attrValue", "");
+          this.$set(this, "attrTxt", "请选择");
+        }
+      },
+      //购物车；
+      ChangeCartNum: function (changeValue) {
+        //changeValue:是否 加|减
+        //获取当前变动属性
+        let productSelect = this.productValue[this.attrValue];
+        //如果没有属性,赋值给商品默认库存
+        if (productSelect === undefined && !this.attr.productAttr.length) {
+          productSelect = this.attr.productSelect;
+        }
+        //无属性值即库存为0；不存在加减；
+        if (productSelect === undefined) return;
+        let stock = productSelect.stock || 0;
+        let num = this.attr.productSelect;
+        if (changeValue) {
+          num.cart_num++;
+          if (num.cart_num > stock) {
+            this.$set(this.attr.productSelect, "cart_num", stock);
+            this.$set(this, "cart_num", stock);
           } else {
-            that.posterData.title = that.storeInfo.storeName;
+            this.$set(this.attr.productSelect, "cart_num", num.cart_num);
+            this.$set(this, "cart_num", num.cart_num);
           }
-          that.posterData.price = that.storeInfo.price;
-          that.posterData.code = that.storeInfo.codeBase;
-          that.systemStore = res.data.systemStore;
-          let good_list = res.data.goodList || [];
-          let goodArray = [];
-          let count = Math.ceil(good_list.length / 6);
-          for (let i = 0; i < count; i++) {
-            var list = good_list.slice(i * 6, 6);
-            if (list.length)
-              goodArray.push({
-                list: list,
-              });
+        } else {
+          num.cart_num--;
+          if (num.cart_num < 1) {
+            this.$set(this.attr.productSelect, "cart_num", 1);
+            this.$set(this, "cart_num", 1);
+          } else {
+            this.$set(this.attr.productSelect, "cart_num", num.cart_num);
+            this.$set(this, "cart_num", num.cart_num);
           }
-          that.mapKay = res.data.mapKay;
-          that.$set(that, "goodList", goodArray);
-          that.updateTitle();
-          that.DefaultSelect();
-          that.getCartCount();
-        })
-        .catch((err) => {
-          uni.showToast({
-            title:
-              err.msg || err.response.data.msg || err.response.data.message,
-            icon: "none",
-            duration: 2000,
-          });
-        })
-        .finally(() => {
-          uni.hideLoading();
+        }
+      },
+      //将父级向子集多次传送的函数合二为一；
+      changeFun: function (opt) {
+        if (typeof opt !== "object") opt = {};
+        let action = opt.action || "";
+        let value = opt.value === undefined ? "" : opt.value;
+        this[action] && this[action](value);
+      },
+      //打开优惠券插件；
+      couponTap: function () {
+        let that = this;
+        that.coupons();
+        that.coupon.coupon = true;
+      },
+      changecoupon: function (msg) {
+        this.coupon.coupon = msg;
+        this.coupons();
+      },
+      currentcoupon: function (res) {
+        let that = this;
+        that.coupon.coupon = false;
+        that.$set(that.coupon.list[res], "is_use", true);
+      },
+      //可领取优惠券接口；
+      coupons: function () {
+        let that = this,
+          q = {
+            page: 1,
+            limit: 20,
+          };
+        getCoupon(q).then((res) => {
+          that.$set(that, "couponList", res.data || []);
+          that.$set(that.coupon, "list", res.data);
         });
-    },
-    //默认选中属性；
-    DefaultSelect: function () {
-      let productAttr = this.attr.productAttr;
-      let value = [];
-      for (let i = 0; i < productAttr.length; i++) {
-        this.$set(productAttr[i], "index", 0);
-        value.push(productAttr[i].attrValueArr[0]);
-      }
-      //sort();排序函数:数字-英文-汉字；
-      let productSelect = this.productValue[value.sort().join(",")];
-      if (productSelect && productAttr.length) {
-        this.$set(
-          this.attr.productSelect,
-          "store_name",
-          this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", productSelect.image);
-        this.$set(this.attr.productSelect, "price", productSelect.price);
-        this.$set(this.attr.productSelect, "stock", productSelect.stock);
-        this.$set(this.attr.productSelect, "unique", productSelect.unique);
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", value.sort().join(","));
-        this.$set(this, "attrTxt", "已选择");
-      } else if (!productSelect && productAttr.length) {
-        this.$set(
-          this.attr.productSelect,
-          "store_name",
-          this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "stock", 0);
-        this.$set(this.attr.productSelect, "unique", "");
-        this.$set(this.attr.productSelect, "cart_num", 0);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      } else if (!productSelect && !productAttr.length) {
-        this.$set(
-          this.attr.productSelect,
-          "store_name",
-          this.storeInfo.storeName
-        );
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "stock", this.storeInfo.stock);
-        this.$set(
-          this.attr.productSelect,
-          "unique",
-          this.storeInfo.unique || ""
-        );
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      }
-    },
-    //购物车；
-    ChangeCartNum: function (changeValue) {
-      //changeValue:是否 加|减
-      //获取当前变动属性
-      let productSelect = this.productValue[this.attrValue];
-      //如果没有属性,赋值给商品默认库存
-      if (productSelect === undefined && !this.attr.productAttr.length) {
-        productSelect = this.attr.productSelect;
-      }
-      //无属性值即库存为0；不存在加减；
-      if (productSelect === undefined) return;
-      let stock = productSelect.stock || 0;
-      let num = this.attr.productSelect;
-      if (changeValue) {
-        num.cart_num++;
-        if (num.cart_num > stock) {
-          this.$set(this.attr.productSelect, "cart_num", stock);
-          this.$set(this, "cart_num", stock);
+      },
+      //打开属性插件；
+      selecAttrTap: function () {
+        this.attr.cartAttr = true;
+        this.isOpen = true;
+      },
+      changeattr: function (msg) {
+        // 修改了规格
+        console.log(msg);
+        this.attr.cartAttr = msg;
+        this.isOpen = false;
+      },
+      //选择属性；
+      ChangeAttr: function (res) {
+        // 修改了规格
+
+        let productSelect = this.productValue[res.value];
+        console.log(productSelect);
+        if (productSelect) {
+          this.attr.productAttr[res.indexw].index = res.indexn;
+          this.$set(this.attr.productSelect, "image", productSelect.image);
+          this.$set(this.attr.productSelect, "price", productSelect.price);
+          this.$set(this.attr.productSelect, "stock", productSelect.stock);
+          this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this.attr.productSelect, "cart_num", 1);
+          this.$set(this, "attrValue", res.value);
+          this.$set(this, "attrTxt", "已选择");
         } else {
-          this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-          this.$set(this, "cart_num", num.cart_num);
+          this.$set(this.attr.productSelect, "image", this.storeInfo.image);
+          this.$set(this.attr.productSelect, "price", this.storeInfo.price);
+          this.$set(this.attr.productSelect, "stock", 0);
+          this.$set(this.attr.productSelect, "unique", "");
+          this.$set(this.attr.productSelect, "cart_num", 0);
+          this.$set(this, "attrValue", "");
+          this.$set(this, "attrTxt", "请选择");
         }
-      } else {
-        num.cart_num--;
-        if (num.cart_num < 1) {
-          this.$set(this.attr.productSelect, "cart_num", 1);
-          this.$set(this, "cart_num", 1);
+      },
+      //收藏商品
+      setCollect: function () {
+        let that = this,
+          id = that.storeInfo.id,
+          category = "collect";
+        if (that.storeInfo.userCollect) {
+          getCollectDel(id, category).then(function () {
+            that.storeInfo.userCollect = !that.storeInfo.userCollect;
+          });
         } else {
-          this.$set(this.attr.productSelect, "cart_num", num.cart_num);
-          this.$set(this, "cart_num", num.cart_num);
+          getCollectAdd(id, category).then(function () {
+            that.storeInfo.userCollect = !that.storeInfo.userCollect;
+          });
         }
-      }
-    },
-    //将父级向子集多次传送的函数合二为一；
-    changeFun: function (opt) {
-      if (typeof opt !== "object") opt = {};
-      let action = opt.action || "";
-      let value = opt.value === undefined ? "" : opt.value;
-      this[action] && this[action](value);
-    },
-    //打开优惠券插件；
-    couponTap: function () {
-      let that = this;
-      that.coupons();
-      that.coupon.coupon = true;
-    },
-    changecoupon: function (msg) {
-      this.coupon.coupon = msg;
-      this.coupons();
-    },
-    currentcoupon: function (res) {
-      let that = this;
-      that.coupon.coupon = false;
-      that.$set(that.coupon.list[res], "is_use", true);
-    },
-    //可领取优惠券接口；
-    coupons: function () {
-      let that = this,
-        q = {
-          page: 1,
-          limit: 20,
+      },
+      //  点击加入购物车按钮
+      joinCart: function () {
+        //0=加入购物车
+        this.goCat(0);
+      },
+      // 加入购物车；
+      goCat: function (news) {
+        let that = this,
+          productSelect = that.productValue[this.attrValue];
+        //打开属性
+        if (that.attrValue) {
+          //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
+          that.attr.cartAttr = !that.isOpen ? true : false;
+        } else {
+          if (that.isOpen) that.attr.cartAttr = true;
+          else that.attr.cartAttr = !that.attr.cartAttr;
+        }
+        //只有关闭属性弹窗时进行加入购物车
+        if (that.attr.cartAttr === true && that.isOpen === false)
+          return (that.isOpen = true);
+        //如果有属性,没有选择,提示用户选择
+        if (
+          that.attr.productAttr.length &&
+          productSelect === undefined &&
+          that.isOpen === true
+        ) {
+          uni.showToast({
+            title: "产品库存不足，请选择其它",
+            icon: "none",
+            duration: 2000,
+          });
+          return;
+        }
+        let q = {
+          productId: that.id,
+          cartNum: that.attr.productSelect.cart_num,
+          new: news,
+          uniqueId: that.attr.productSelect !== undefined ?
+            that.attr.productSelect.unique :
+            "",
         };
-      getCoupon(q).then((res) => {
-        that.$set(that, "couponList", res.data || []);
-        that.$set(that.coupon, "list", res.data);
-      });
-    },
-    //打开属性插件；
-    selecAttrTap: function () {
-      this.attr.cartAttr = true;
-      this.isOpen = true;
-    },
-    changeattr: function (msg) {
-      // 修改了规格
-      console.log(msg);
-      this.attr.cartAttr = msg;
-      this.isOpen = false;
-    },
-    //选择属性；
-    ChangeAttr: function (res) {
-      // 修改了规格
-
-      let productSelect = this.productValue[res.value];
-      console.log(productSelect);
-      if (productSelect) {
-        this.attr.productAttr[res.indexw].index = res.indexn;
-        this.$set(this.attr.productSelect, "image", productSelect.image);
-        this.$set(this.attr.productSelect, "price", productSelect.price);
-        this.$set(this.attr.productSelect, "stock", productSelect.stock);
-        this.$set(this.attr.productSelect, "unique", productSelect.unique);
-        this.$set(this.attr.productSelect, "cart_num", 1);
-        this.$set(this, "attrValue", res.value);
-        this.$set(this, "attrTxt", "已选择");
-      } else {
-        this.$set(this.attr.productSelect, "image", this.storeInfo.image);
-        this.$set(this.attr.productSelect, "price", this.storeInfo.price);
-        this.$set(this.attr.productSelect, "stock", 0);
-        this.$set(this.attr.productSelect, "unique", "");
-        this.$set(this.attr.productSelect, "cart_num", 0);
-        this.$set(this, "attrValue", "");
-        this.$set(this, "attrTxt", "请选择");
-      }
-    },
-    //收藏商品
-    setCollect: function () {
-      let that = this,
-        id = that.storeInfo.id,
-        category = "collect";
-      if (that.storeInfo.userCollect) {
-        getCollectDel(id, category).then(function () {
-          that.storeInfo.userCollect = !that.storeInfo.userCollect;
-        });
-      } else {
-        getCollectAdd(id, category).then(function () {
-          that.storeInfo.userCollect = !that.storeInfo.userCollect;
-        });
-      }
-    },
-    //  点击加入购物车按钮
-    joinCart: function () {
-      //0=加入购物车
-      this.goCat(0);
-    },
-    // 加入购物车；
-    goCat: function (news) {
-      let that = this,
-        productSelect = that.productValue[this.attrValue];
-      //打开属性
-      if (that.attrValue) {
-        //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性
-        that.attr.cartAttr = !that.isOpen ? true : false;
-      } else {
-        if (that.isOpen) that.attr.cartAttr = true;
-        else that.attr.cartAttr = !that.attr.cartAttr;
-      }
-      //只有关闭属性弹窗时进行加入购物车
-      if (that.attr.cartAttr === true && that.isOpen === false)
-        return (that.isOpen = true);
-      //如果有属性,没有选择,提示用户选择
-      if (
-        that.attr.productAttr.length &&
-        productSelect === undefined &&
-        that.isOpen === true
-      ) {
-        uni.showToast({
-          title: "产品库存不足，请选择其它",
-          icon: "none",
-          duration: 2000,
-        });
-        return;
-      }
-      let q = {
-        productId: that.id,
-        cartNum: that.attr.productSelect.cart_num,
-        new: news,
-        uniqueId:
-          that.attr.productSelect !== undefined
-            ? that.attr.productSelect.unique
-            : "",
-      };
-      postCartAdd(q)
-        .then(function (res) {
-          that.isOpen = false;
-          that.attr.cartAttr = false;
-          if (news) {
-            if (!res.data) {
+        postCartAdd(q)
+          .then(function (res) {
+            that.isOpen = false;
+            that.attr.cartAttr = false;
+            if (news) {
+              if (!res.data) {
+                uni.showToast({
+                  title: res.msg || res.data.msg || res.data.message,
+                  icon: "none",
+                  duration: 2000,
+                });
+                return;
+              }
+              that.$yrouter.push({
+                path: "/pages/order/OrderSubmission/index",
+                query: {
+                  id: res.data.cartId,
+                },
+              });
+            } else {
               uni.showToast({
-                title:
-                  res.msg || res.data.msg || res.data.message,
-                icon: "none",
+                title: "添加购物车成功",
+                icon: "success",
                 duration: 2000,
+                complete: () => {
+                  that.getCartCount(true);
+                },
               });
-              return;
             }
-            that.$yrouter.push({
-              path: "/pages/order/OrderSubmission/index",
-              query: {
-                id: res.data.cartId,
-              },
-            });
-          } else {
+          })
+          .catch((error) => {
+            that.isOpen = false;
             uni.showToast({
-              title: "添加购物车成功",
-              icon: "success",
+              title: error.response.data.msg,
+              icon: "none",
               duration: 2000,
-              complete: () => {
-                that.getCartCount(true);
-              },
             });
-          }
-        })
-        .catch((error) => {
-          that.isOpen = false;
-          uni.showToast({
-            title: error.response.data.msg,
-            icon: "none",
-            duration: 2000,
           });
-        });
-    },
-    //获取购物车数量
-    getCartCount: function (isAnima) {
-      let that = this;
-      const isLogin = that.isLogin;
-      if (isLogin) {
-        getCartCount({
-          numType: 0,
-        }).then((res) => {
-          that.CartCount = res.data.count;
-          //加入购物车后重置属性
-          if (isAnima) {
-            that.animated = true;
-            setTimeout(function () {
-              that.animated = false;
-            }, 500);
-          }
-        });
-      }
-    },
-    //立即购买；
-    tapBuy: function () {
-      //  1=直接购买
-      this.goCat(1);
-    },
-    listenerActionSheet: function () {
-      if (isWeixin() === true) {
-        this.weixinStatus = true;
-      }
-      this.posters = true;
-    },
-    listenerActionClose: function () {
-      this.posters = false;
-    },
-    setOpenShare: function () {
-      var data = this.storeInfo;
-      var href = this.location.href;
-      if (this.$deviceType == "weixin") {
-        if (this.isLogin) {
-          getUserInfo().then((res) => {
-            href =
-              href.indexOf("?") === -1
-                ? href + "?spread=" + res.data.uid
-                : href + "&spread=" + res.data.uid;
+      },
+      //获取购物车数量
+      getCartCount: function (isAnima) {
+        let that = this;
+        const isLogin = that.isLogin;
+        if (isLogin) {
+          getCartCount({
+            numType: 0,
+          }).then((res) => {
+            that.CartCount = res.data.count;
+            //加入购物车后重置属性
+            if (isAnima) {
+              that.animated = true;
+              setTimeout(function () {
+                that.animated = false;
+              }, 500);
+            }
+          });
+        }
+      },
+      //立即购买；
+      tapBuy: function () {
+        //  1=直接购买
+        this.goCat(1);
+      },
+      listenerActionSheet: function () {
+        if (isWeixin() === true) {
+          this.weixinStatus = true;
+        }
+        this.posters = true;
+      },
+      listenerActionClose: function () {
+        this.posters = false;
+      },
+      setOpenShare: function () {
+        var data = this.storeInfo;
+        var href = this.location.href;
+        if (this.$deviceType == "weixin") {
+          if (this.isLogin) {
+            getUserInfo().then((res) => {
+              href =
+                href.indexOf("?") === -1 ?
+                href + "?spread=" + res.data.uid :
+                href + "&spread=" + res.data.uid;
+              var configAppMessage = {
+                desc: data.storeInfo,
+                title: data.storeName,
+                link: href,
+                imgUrl: data.image,
+              };
+              wechatEvevt(
+                  ["updateAppMessageShareData", "updateTimelineShareData"],
+                  configAppMessage
+                )
+                .then((res) => {})
+                .catch((res) => {
+                  if (res.is_ready) {
+                    res.wx.updateAppMessageShareData(configAppMessage);
+                    res.wx.updateTimelineShareData(configAppMessage);
+                  }
+                });
+            });
+          } else {
             var configAppMessage = {
               desc: data.storeInfo,
               title: data.storeName,
@@ -838,9 +809,9 @@ export default {
               imgUrl: data.image,
             };
             wechatEvevt(
-              ["updateAppMessageShareData", "updateTimelineShareData"],
-              configAppMessage
-            )
+                ["updateAppMessageShareData", "updateTimelineShareData"],
+                configAppMessage
+              )
               .then((res) => {})
               .catch((res) => {
                 if (res.is_ready) {
@@ -848,250 +819,231 @@ export default {
                   res.wx.updateTimelineShareData(configAppMessage);
                 }
               });
-          });
-        } else {
-          var configAppMessage = {
-            desc: data.storeInfo,
-            title: data.storeName,
-            link: href,
-            imgUrl: data.image,
-          };
-          wechatEvevt(
-            ["updateAppMessageShareData", "updateTimelineShareData"],
-            configAppMessage
-          )
-            .then((res) => {})
-            .catch((res) => {
-              if (res.is_ready) {
-                res.wx.updateAppMessageShareData(configAppMessage);
-                res.wx.updateTimelineShareData(configAppMessage);
-              }
-            });
+          }
         }
-      }
+      },
     },
-  },
-};
+  };
 </script>
 
 
 <style scoped lang="less">
-.geoPage {
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  z-index: 10000;
-}
+  .geoPage {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    z-index: 10000;
+  }
 
-.product-con .store-info {
-  margin-top: 0.2 * 100rpx;
-  background-color: #fff;
-}
+  .product-con .store-info {
+    margin-top: 0.2 * 100rpx;
+    background-color: #fff;
+  }
 
-.product-con .store-info .title {
-  padding: 0 0.3 * 100rpx;
-  font-size: 0.28 * 100rpx;
-  color: #282828;
-  height: 0.8 * 100rpx;
-  line-height: 0.8 * 100rpx;
-  border-bottom: 0.01 * 100rpx solid #f5f5f5;
-}
+  .product-con .store-info .title {
+    padding: 0 0.3 * 100rpx;
+    font-size: 0.28 * 100rpx;
+    color: #282828;
+    height: 0.8 * 100rpx;
+    line-height: 0.8 * 100rpx;
+    border-bottom: 0.01 * 100rpx solid #f5f5f5;
+  }
 
-.product-con .store-info .info {
-  padding: 0 0.3 * 100rpx;
-  height: 1.26 * 100rpx;
-}
+  .product-con .store-info .info {
+    padding: 0 0.3 * 100rpx;
+    height: 1.26 * 100rpx;
+  }
 
-.product-con .store-info .info .picTxt {
-  width: 100%;
-  display: flex;
-  align-items: center;
-}
+  .product-con .store-info .info .picTxt {
+    width: 100%;
+    display: flex;
+    align-items: center;
+  }
 
-.product-con .store-info .info .picTxt .pictrue {
-  width: 0.76 * 100rpx;
-  height: 0.76 * 100rpx;
-  margin-right: 0.2 * 100rpx;
-}
+  .product-con .store-info .info .picTxt .pictrue {
+    width: 0.76 * 100rpx;
+    height: 0.76 * 100rpx;
+    margin-right: 0.2 * 100rpx;
+  }
 
-.product-con .store-info .info .picTxt .pictrue image {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06 * 100rpx;
-}
+  .product-con .store-info .info .picTxt .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 0.06 * 100rpx;
+  }
 
-.product-con .store-info .info .picTxt .text {
-  flex: 1;
-}
+  .product-con .store-info .info .picTxt .text {
+    flex: 1;
+  }
 
-.product-con .store-info .info .picTxt .text .name {
-  font-size: 0.3 * 100rpx;
-  color: #282828;
-}
+  .product-con .store-info .info .picTxt .text .name {
+    font-size: 0.3 * 100rpx;
+    color: #282828;
+  }
 
-.product-con .store-info .info .picTxt .text .address {
-  font-size: 0.24 * 100rpx;
-  color: #666;
-  margin-top: 0.03 * 100rpx;
-}
+  .product-con .store-info .info .picTxt .text .address {
+    font-size: 0.24 * 100rpx;
+    color: #666;
+    margin-top: 0.03 * 100rpx;
+  }
 
-.product-con .store-info .info .picTxt .text .address .iconfont {
-  color: #707070;
-  font-size: 0.18 * 100rpx;
-  margin-left: 0.1 * 100rpx;
-}
+  .product-con .store-info .info .picTxt .text .address .iconfont {
+    color: #707070;
+    font-size: 0.18 * 100rpx;
+    margin-left: 0.1 * 100rpx;
+  }
 
-.product-con .store-info .info .picTxt .addressBox {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-}
+  .product-con .store-info .info .picTxt .addressBox {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+  }
 
-.product-con .store-info .info .picTxt .addressBox .iconfont {
-  font-size: 0.4 * 100rpx;
-}
+  .product-con .store-info .info .picTxt .addressBox .iconfont {
+    font-size: 0.4 * 100rpx;
+  }
 
-.product-con .store-info .info .picTxt .addressBox .addressTxt {
-  font-size: 0.24 * 100rpx;
-  color: #eb3729;
-}
+  .product-con .store-info .info .picTxt .addressBox .addressTxt {
+    font-size: 0.24 * 100rpx;
+    color: #eb3729;
+  }
 
-.product-con .store-info .praise {
-  font-size: 0.28 * 100rpx;
-  color: #808080;
-}
+  .product-con .store-info .praise {
+    font-size: 0.28 * 100rpx;
+    color: #808080;
+  }
 
-.product-con .store-info .praise .iconfont {
-  font-size: 0.28 * 100rpx;
-}
+  .product-con .store-info .praise .iconfont {
+    font-size: 0.28 * 100rpx;
+  }
 
-.product-con .superior {
-  background-color: #fff;
-  margin-top: 0.2 * 100rpx;
-}
+  .product-con .superior {
+    background-color: #fff;
+    margin-top: 0.2 * 100rpx;
+  }
 
-.product-con .superior .title {
-  height: 0.98 * 100rpx;
-}
+  .product-con .superior .title {
+    height: 0.98 * 100rpx;
+  }
 
-.product-con .superior .title image {
-  width: 0.3 * 100rpx;
-  height: 0.3 * 100rpx;
-}
+  .product-con .superior .title image {
+    width: 0.3 * 100rpx;
+    height: 0.3 * 100rpx;
+  }
 
-.product-con .superior .title .titleTxt {
-  margin: 0 0.2 * 100rpx;
-  font-size: 0.3 * 100rpx;
-  background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
-  -webkit-background-clip: text;
-  -webkit-text-fill-color: transparent;
-}
+  .product-con .superior .title .titleTxt {
+    margin: 0 0.2 * 100rpx;
+    font-size: 0.3 * 100rpx;
+    background-image: linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+    background-image: -webkit-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+    background-image: -moz-linear-gradient(to right, #f57a37 0%, #f21b07 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+  }
 
-.product-con .superior .slider-banner {
-  width: 6.9 * 100rpx;
-  margin: 0 auto;
-  padding-bottom: 0.2 * 100rpx;
-}
+  .product-con .superior .slider-banner {
+    width: 6.9 * 100rpx;
+    margin: 0 auto;
+    padding-bottom: 0.2 * 100rpx;
+  }
 
-.product-con .superior .slider-banner .list {
-  width: 100%;
-  padding-bottom: 0.2 * 100rpx;
-}
+  .product-con .superior .slider-banner .list {
+    width: 100%;
+    padding-bottom: 0.2 * 100rpx;
+  }
 
-.product-con .superior .slider-banner .list .item {
-  width: 2.15 * 100rpx;
-  margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
-  font-size: 0.26 * 100rpx;
-}
+  .product-con .superior .slider-banner .list .item {
+    width: 2.15 * 100rpx;
+    margin: 0 0.22 * 100rpx 0.3 * 100rpx 0;
+    font-size: 0.26 * 100rpx;
+  }
 
-.product-con .superior .slider-banner .list .item:nth-of-type(3n) {
-  margin-right: 0;
-}
+  .product-con .superior .slider-banner .list .item:nth-of-type(3n) {
+    margin-right: 0;
+  }
 
-.product-con .superior .slider-banner .list .item .pictrue {
-  width: 100%;
-  height: 2.15 * 100rpx;
-}
+  .product-con .superior .slider-banner .list .item .pictrue {
+    width: 100%;
+    height: 2.15 * 100rpx;
+  }
 
-.product-con .superior .slider-banner .list .item .pictrue image {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.06 * 100rpx;
-}
+  .product-con .superior .slider-banner .list .item .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 0.06 * 100rpx;
+  }
 
-.product-con .superior .slider-banner .list .item .name {
-  color: #282828;
-  margin-top: 0.12 * 100rpx;
-}
+  .product-con .superior .slider-banner .list .item .name {
+    color: #282828;
+    margin-top: 0.12 * 100rpx;
+  }
 
-.product-con .superior .slider-banner .swiper-pagination-bullet {
-  background-color: #999;
-}
+  .product-con .superior .slider-banner .swiper-pagination-bullet {
+    background-color: #999;
+  }
 
-.product-con .superior .slider-banner .swiper-pagination-bullet-active {
-  background-color: #e93323;
-}
+  .product-con .superior .slider-banner .swiper-pagination-bullet-active {
+    background-color: #e93323;
+  }
 
-.mask {
-  -webkit-filter: blur(2px);
-  -moz-filter: blur(2px);
-  -ms-filter: blur(2px);
-  filter: blur(2px);
-}
+  .mask {
+    -webkit-filter: blur(2px);
+    -moz-filter: blur(2px);
+    -ms-filter: blur(2px);
+    filter: blur(2px);
+  }
 
-.product-con .product-intro .conter view {
-  width: 100% !important;
-}
+  .product-con .product-intro .conter view {
+    width: 100% !important;
+  }
 
-.generate-posters {
-  width: 100%;
-  height: 1.7 * 100rpx;
-  background-color: #fff;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  z-index: 99;
-  transform: translate3d(0, 100%, 0);
-  -webkit-transform: translate3d(0, 100%, 0);
-  -ms-transform: translate3d(0, 100%, 0);
-  -moz-transform: translate3d(0, 100%, 0);
-  -o-transform: translate3d(0, 100%, 0);
-  transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-  -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-}
+  .generate-posters {
+    width: 100%;
+    height: 1.7 * 100rpx;
+    background-color: #fff;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 99;
+    transform: translate3d(0, 100%, 0);
+    -webkit-transform: translate3d(0, 100%, 0);
+    -ms-transform: translate3d(0, 100%, 0);
+    -moz-transform: translate3d(0, 100%, 0);
+    -o-transform: translate3d(0, 100%, 0);
+    transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+    -webkit-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+    -moz-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+    -o-transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
+  }
 
-.generate-posters.on {
-  transform: translate3d(0, 0, 0);
-  -webkit-transform: translate3d(0, 0, 0);
-  -ms-transform: translate3d(0, 0, 0);
-  -moz-transform: translate3d(0, 0, 0);
-  -o-transform: translate3d(0, 0, 0);
-}
+  .generate-posters.on {
+    transform: translate3d(0, 0, 0);
+    -webkit-transform: translate3d(0, 0, 0);
+    -ms-transform: translate3d(0, 0, 0);
+    -moz-transform: translate3d(0, 0, 0);
+    -o-transform: translate3d(0, 0, 0);
+  }
 
-.generate-posters .item {
-  flex: 50%;
-  -webkit-flex: 50%;
-  -ms-flex: 50%;
-  text-align: center;
-}
+  .generate-posters .item {
+    flex: 50%;
+    -webkit-flex: 50%;
+    -ms-flex: 50%;
+    text-align: center;
+  }
 
-.generate-posters .item .iconfont {
-  font-size: 0.8 * 100rpx;
-  color: #5eae72;
-}
+  .generate-posters .item .iconfont {
+    font-size: 0.8 * 100rpx;
+    color: #5eae72;
+  }
 
-.generate-posters .item .iconfont.icon-haibao {
-  color: #5391f1;
-}
+  .generate-posters .item .iconfont.icon-haibao {
+    color: #5391f1;
+  }
 
-.noscroll {
-  height: 100%;
-  overflow: hidden;
-}
+  .noscroll {
+    height: 100%;
+    overflow: hidden;
+  }
 </style>
 
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 938233a..a833bfe 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -6,20 +6,11 @@
           <input placeholder="搜索商品信息" v-model="where.keyword" />
           <text class="iconfont icon-sousuo" @click="submitForm"></text>
         </view>
-        <view
-          class="iconfont"
-          :class="Switch === true ? 'icon-pailie' : 'icon-tupianpailie'"
-          @click="switchTap"
-        ></view>
+        <view class="iconfont" :class="Switch === true ? 'icon-pailie' : 'icon-tupianpailie'" @click="switchTap"></view>
       </view>
     </form>
     <view class="nav acea-row row-middle">
-      <view
-        class="item"
-        :class="title ? 'font-color-red' : ''"
-        @click="set_where(0)"
-        >{{ title ? title : "默认" }}</view
-      >
+      <view class="item" :class="title ? 'font-color-red' : ''" @click="set_where(0)">{{ title ? title : "默认" }}</view>
       <view class="item" @click="set_where(1)">
         价格
         <image src="@/static/images/horn.png" v-if="price === 0" />
@@ -33,274 +24,276 @@
         <image src="@/static/images/down.png" v-if="stock === 2" />
       </view>
       <!-- down -->
-      <view
-        class="item"
-        :class="nows ? 'font-color-red' : ''"
-        @click="set_where(3)"
-        >新品</view
-      >
+      <view class="item" :class="nows ? 'font-color-red' : ''" @click="set_where(3)">新品</view>
     </view>
-    <view
-      class="list acea-row row-between-wrapper"
-      :class="Switch === true ? '' : 'on'"
-      ref="container"
-    >
-      <view
-        @click="goGoodsCon(item)"
-        class="item"
-        :class="Switch === true ? '' : 'on'"
-        v-for="(item, productListIndex) in productList"
-        :key="productListIndex"
-        :title="item.storeName"
-      >
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container"
+      v-if="isIntegral=='false'">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
+        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
         <view class="pictrue" :class="Switch === true ? '' : 'on'">
           <image :src="item.image" :class="Switch === true ? '' : 'on'" />
         </view>
         <view class="text" :class="Switch === true ? '' : 'on'">
           <view class="name line1">{{ item.storeName }}</view>
-          <view
-            class="money font-color-red"
-            :class="Switch === true ? '' : 'on'"
-          >
+          <view class="money font-color-red" :class="Switch === true ? '' : 'on'">
             ￥
             <text class="num">{{ item.price }}</text>
           </view>
-          <view
-            class="vip acea-row row-between-wrapper"
-            :class="Switch === true ? '' : 'on'"
-          >
+          <view class="vip acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'">
             <view class="vip-money">￥{{ item.otPrice }}</view>
             <view>已售{{ item.sales }}件</view>
           </view>
         </view>
       </view>
     </view>
+    <view class="list acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'" ref="container"
+      v-if="isIntegral=='true'">
+      <view @click="goGoodsCon(item)" class="item" :class="Switch === true ? '' : 'on'"
+        v-for="(item, productListIndex) in productList" :key="productListIndex" :title="item.storeName">
+        <view class="pictrue" :class="Switch === true ? '' : 'on'">
+          <image :src="item.image" :class="Switch === true ? '' : 'on'" />
+        </view>
+        <view class="text" :class="Switch === true ? '' : 'on'">
+          <view class="name line1">{{ item.storeName }}</view>
+          <view class="money font-color-red" :class="Switch === true ? '' : 'on'">
+            <text class="num">{{ item.price }}积分</text>
+          </view>
+          <view class="vip acea-row row-between-wrapper" :class="Switch === true ? '' : 'on'">
+            <!-- <view class="vip-money">￥{{ item.otPrice }}</view> -->
+            <view>已售{{ item.sales }}件</view>
+          </view>
+        </view>
+      </view>
+    </view>
     <Loading :loaded="loadend" :loading="loading"></Loading>
-    <view
-      class="noCommodity"
-      style="background-color: #fff"
-      v-if="productList.length === 0 && where.page > 1"
-    >
+    <view class="noCommodity" style="background-color: #fff" v-if="productList.length === 0 && where.page > 1">
       <view class="noPictrue">
         <image src="@/static/images/noGood.png" class="image" />
       </view>
     </view>
-    <Recommend
-      v-if="productList.length === 0 && where.page > 1"
-      :recommendLoading="recommendLoading"
-      @changeRecommendLoading="changeRecommendLoading"
-    ></Recommend>
+    <Recommend v-if="productList.length === 0 && where.page > 1" :recommendLoading="recommendLoading"
+      @changeRecommendLoading="changeRecommendLoading"></Recommend>
   </view>
 </template>
 <script>
-import Recommend from "@/components/Recommend";
-import { getProducts } from "@/api/store";
-import Loading from "@/components/Loading";
+  import Recommend from "@/components/Recommend";
+  import {
+    getProducts,getProductsIntegral
+  } from "@/api/store";
+  import Loading from "@/components/Loading";
 
-export default {
-  name: "GoodsList",
-  components: {
-    Recommend,
-    Loading,
-  },
-  props: {},
-  data: function () {
-    // const { s = "", id = 0, title = "" } = this.$yroute.query;
-    const s = "",
-      id = 0,
-      title = "";
+  export default {
+    name: "GoodsList",
+    components: {
+      Recommend,
+      Loading,
+    },
+    props: {},
+    data: function () {
+      // const { s = "", id = 0, title = "" } = this.$yroute.query;
+      const s = "",
+        id = 0,
+        title = "";
 
-    return {
-      hostProduct: [],
-      productList: [],
-      Switch: true,
-      where: {
-        page: 1,
-        limit: 8,
-        keyword: s,
-        sid: id, //二级分类id
-        news: 0,
-        priceOrder: "",
-        salesOrder: "",
-      },
-      title: title && id ? title : "",
-      loadTitle: "",
-      loading: false,
-      loadend: false,
-      price: 0,
-      stock: 0,
-      nows: false,
-      recommendLoading: false,
-      target: false,
-    };
-  },
-  watch: {
-    title() {
-      this.updateTitle();
+      return {
+        hostProduct: [],
+        productList: [],
+        Switch: true,
+        where: {
+          page: 1,
+          limit: 8,
+          keyword: s,
+          sid: id, //二级分类id
+          news: 0,
+          priceOrder: "",
+          salesOrder: "",
+        },
+        title: title && id ? title : "",
+        loadTitle: "",
+        loading: false,
+        loadend: false,
+        price: 0,
+        stock: 0,
+        nows: false,
+        recommendLoading: false,
+        target: false,
+        isIntegral: false
+      };
     },
-    $yroute(to) {
-      // if (to.name !== "GoodsList") return;
-      // const { s = "", id = 0, title = "" } = to.query;
-      // if (s !== this.where.keyword || id !== this.where.sid) {
-      //   this.where.keyword = s;
-      //   this.loadend = false;
-      //   this.loading = false;
-      //   this.where.page = 1;
-      //   this.where.sid = id;
-      //   this.title = title && id ? title : "";
-      //   this.nows = false;
-      //   this.$set(this, "productList", []);
-      //   this.price = 0;
-      //   this.stock = 0;
-      //   this.get_product_list();
-      // }
+    watch: {
+      title() {
+        this.updateTitle();
+      },
+      $yroute(to) {
+        // if (to.name !== "GoodsList") return;
+        // const { s = "", id = 0, title = "" } = to.query;
+        // if (s !== this.where.keyword || id !== this.where.sid) {
+        //   this.where.keyword = s;
+        //   this.loadend = false;
+        //   this.loading = false;
+        //   this.where.page = 1;
+        //   this.where.sid = id;
+        //   this.title = title && id ? title : "";
+        //   this.nows = false;
+        //   this.$set(this, "productList", []);
+        //   this.price = 0;
+        //   this.stock = 0;
+        //   this.getProductList();
+        // }
+      },
     },
-  },
-  mounted: function () {
-    const { s = "", id = 0, title = "" } = this.$yroute.query;
-    this.where.keyword = s;
-
-    this.updateTitle();
-    this.get_product_list();
-  },
-  onReachBottom() {
-    this.recommendLoading = true;
-    !this.loading && this.get_product_list();
-  },
-  onHide() {
-    // this.hostProduct = [];
-    // this.productList = [];
-    // this.Switch = true;
-    // this.where = {
-    //   page: 1,
-    //   limit: 8,
-    //   keyword: s,
-    //   sid: id, //二级分类id
-    //   news: 0,
-    //   priceOrder: "",
-    //   salesOrder: ""
-    // };
-    // this.loadTitle = "";
-    // this.loading = false;
-    // this.loadend = false;
-    // this.price = 0;
-    // this.stock = 0;
-    // this.nows = fals;
-  },
-  methods: {
-    changeRecommendLoading(recommendLoading) {
-      this.recommendLoading = recommendLoading;
+    mounted: function () {
+      const {
+        s = "", id = 0, title = "", isIntegral = false
+      } = this.$yroute.query;
+      this.where.keyword = s;
+      this.where.isIntegral = isIntegral == 'true' ? 1 : 0;
+      this.isIntegral = isIntegral
+      this.updateTitle();
+      this.getProductList();
     },
-    goGoodsCon(item) {
-      this.$yrouter.push({
-        path: "/pages/shop/GoodsCon/index",
-        query: {
-          id: item.id,
-        },
-      });
+    onReachBottom() {
+      this.recommendLoading = true;
+      !this.loading && this.getProductList();
     },
-    updateTitle() {
-      // document.title = this.title || this.$yroute.meta.title;
+    onHide() {
+      // this.hostProduct = [];
+      // this.productList = [];
+      // this.Switch = true;
+      // this.where = {
+      //   page: 1,
+      //   limit: 8,
+      //   keyword: s,
+      //   sid: id, //二级分类id
+      //   news: 0,
+      //   priceOrder: "",
+      //   salesOrder: ""
+      // };
+      // this.loadTitle = "";
+      // this.loading = false;
+      // this.loadend = false;
+      // this.price = 0;
+      // this.stock = 0;
+      // this.nows = fals;
     },
-    get_product_list() {
-      var that = this;
-      this.setWhere();
-      // if (to.name !== "GoodsList") return;
-      const { s = "", id = 0, title = "" } = this.$yroute.query;
-      if (s !== this.where.keyword || id !== this.where.sid) {
+    methods: {
+      changeRecommendLoading(recommendLoading) {
+        this.recommendLoading = recommendLoading;
+      },
+      goGoodsCon(item) {
+        this.$yrouter.push({
+          path: "/pages/shop/GoodsCon/index",
+          query: {
+            id: item.id,
+            isIntegral:this.isIntegral
+          },
+        });
+      },
+      updateTitle() {
+        // document.title = this.title || this.$yroute.meta.title;
+      },
+      getProductList() {
+        var that = this;
+        this.setWhere();
+        // if (to.name !== "GoodsList") return;
+        const {
+          s = "", id = 0, title = ""
+        } = this.$yroute.query;
+        if (s !== this.where.keyword || id !== this.where.sid) {
+          this.loadend = false;
+          this.loading = false;
+          this.where.page = 1;
+          this.where.sid = id;
+          this.title = title && id ? title : "";
+          this.nows = false;
+          this.$set(this, "productList", []);
+          this.price = 0;
+          this.stock = 0;
+          // this.getProductList();
+        }
+        let q = that.where;
+        let getData = this.isIntegral !== 'true' ? getProducts : getProductsIntegral
+        getData(q).then((res) => {
+          that.loading = false;
+          if (that.target) {
+            that.productList = res.data;
+          } else {
+            that.productList.push.apply(that.productList, res.data);
+          }
+          that.target = false
+          that.loadend = res.data.length < that.where.limit; //判断所有数据是否加载完成；
+          that.where.page = that.where.page + 1;
+        });
+      },
+      submitForm: function () {
+        this.$set(this, "productList", []);
+        this.where.page = 1;
         this.loadend = false;
         this.loading = false;
-        this.where.page = 1;
-        this.where.sid = id;
-        this.title = title && id ? title : "";
-        this.nows = false;
-        this.$set(this, "productList", []);
-        this.price = 0;
-        this.stock = 0;
-        // this.get_product_list();
-      }
-      let q = that.where;
-      getProducts(q).then((res) => {
-        that.loading = false;
-        if (that.target) {
-          that.productList = res.data;
-        } else {
-          that.productList.push.apply(that.productList, res.data);
+        this.getProductList();
+      },
+      //点击事件处理
+      set_where: function (index) {
+        let that = this;
+        switch (index) {
+          case 0:
+            return that.$yrouter.push({
+              path: "/pages/shop/GoodsClass/index",
+            });
+          case 1:
+            if (that.price === 0) that.price = 1;
+            else if (that.price === 1) that.price = 2;
+            else if (that.price === 2) that.price = 0;
+            that.stock = 0;
+            break;
+          case 2:
+            if (that.stock === 0) that.stock = 1;
+            else if (that.stock === 1) that.stock = 2;
+            else if (that.stock === 2) that.stock = 0;
+            that.price = 0;
+            break;
+          case 3:
+            that.nows = !that.nows;
+            break;
+          default:
+            break;
         }
-        that.target = false
-        that.loadend = res.data.length < that.where.limit; //判断所有数据是否加载完成；
-        that.where.page = that.where.page + 1;
-      });
-    },
-    submitForm: function () {
-      this.$set(this, "productList", []);
-      this.where.page = 1;
-      this.loadend = false;
-      this.loading = false;
-      this.get_product_list();
-    },
-    //点击事件处理
-    set_where: function (index) {
-      let that = this;
-      switch (index) {
-        case 0:
-          return that.$yrouter.push({
-            path: "/pages/shop/GoodsClass/index",
-          });
-        case 1:
-          if (that.price === 0) that.price = 1;
-          else if (that.price === 1) that.price = 2;
-          else if (that.price === 2) that.price = 0;
-          that.stock = 0;
-          break;
-        case 2:
-          if (that.stock === 0) that.stock = 1;
-          else if (that.stock === 1) that.stock = 2;
-          else if (that.stock === 2) that.stock = 0;
-          that.price = 0;
-          break;
-        case 3:
-          that.nows = !that.nows;
-          break;
-        default:
-          break;
-      }
-      this.productList = [];
-      that.$set(that, "productList", []);
-      that.where.page = 1;
-      that.target = true;
-      that.loadend = false;
-      that.get_product_list();
-    },
-    //设置where条件
-    setWhere: function () {
-      let that = this;
-      if (that.price === 0) {
-        that.where.priceOrder = "";
-      } else if (that.price === 1) {
-        that.where.priceOrder = "asc";
-      } else if (that.price === 2) {
-        that.where.priceOrder = "desc";
-      }
-      if (that.stock === 0) {
-        that.where.salesOrder = "";
-      } else if (that.stock === 1) {
-        that.where.salesOrder = "asc";
-      } else if (that.stock === 2) {
-        that.where.salesOrder = "desc";
-      }
-      that.where.news = that.nows ? "1" : "0";
-    },
-    switchTap: function () {
-      let that = this;
-      that.Switch = !that.Switch;
+        this.productList = [];
+        that.$set(that, "productList", []);
+        that.where.page = 1;
+        that.target = true;
+        that.loadend = false;
+        that.getProductList();
+      },
+      //设置where条件
+      setWhere: function () {
+        let that = this;
+        if (that.price === 0) {
+          that.where.priceOrder = "";
+        } else if (that.price === 1) {
+          that.where.priceOrder = "asc";
+        } else if (that.price === 2) {
+          that.where.priceOrder = "desc";
+        }
+        if (that.stock === 0) {
+          that.where.salesOrder = "";
+        } else if (that.stock === 1) {
+          that.where.salesOrder = "asc";
+        } else if (that.stock === 2) {
+          that.where.salesOrder = "desc";
+        }
+        that.where.news = that.nows ? "1" : "0";
+      },
+      switchTap: function () {
+        let that = this;
+        that.Switch = !that.Switch;
+      },
     },
-  },
-};
+  };
 </script>
 <style scoped lang="less">
-.noCommodity {
-  border-top: 3px solid #f5f5f5;
-  padding-bottom: 1px;
-}
+  .noCommodity {
+    border-top: 3px solid #f5f5f5;
+    padding-bottom: 1px;
+  }
 </style>
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 4a4c714..59a0943 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -114,11 +114,11 @@
                 <text class="iconfont icon-jiantou"></text>
               </view>
             </template>
-            <!-- <view class="item" @click="goPages2()">
+            <view class="item" @click="goPages2()">
               <view class="pictrue"></view>
-              <view class="cell">hexiao</view>
+              <view class="cell">积分商城</view>
               <text class="iconfont icon-jiantou"></text>
-            </view>-->
+            </view>
           </view>
         </view>
       </view>
@@ -167,7 +167,7 @@
     props: {},
     data: function () {
       return {
-        MyMenus: [],
+        MyMenus: [],
         switchActive: false,
         isWeixin: false
       };
@@ -353,7 +353,13 @@
       },
       goPages2: function () {
         this.$yrouter.push({
-          path: "/pages/orderAdmin/OrderCancellation/index"
+          path: "/pages/shop/GoodsList/index",
+          query: {
+            // id: 0,
+            title: '积分商城',
+            isIntegral: true,
+          }
+
         });
       }
     },