|
@@ -113,7 +113,6 @@
|
|
|
|
|
|
|
|
<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" @showCartItem="showCartItem"></FooterCart>
|
|
<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" @showCartItem="showCartItem"></FooterCart>
|
|
|
<wangCg :show.sync="notOpenShop" @bthClick="goToCg()"></wangCg>
|
|
<wangCg :show.sync="notOpenShop" @bthClick="goToCg()"></wangCg>
|
|
|
- <personComponent :isHd.sync="isHd" @goToMall="goToMall()"></personComponent>
|
|
|
|
|
<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
|
|
<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
|
|
|
<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
|
|
<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
|
|
|
|
|
|
|
@@ -189,7 +188,6 @@ import productMins from "@/mixins/cgProduct";
|
|
|
import { getGhsDataApi, ghsInfo,visitMall,getClassRemind,hasClassRemind } from "@/api/ghs";
|
|
import { getGhsDataApi, ghsInfo,visitMall,getClassRemind,hasClassRemind } from "@/api/ghs";
|
|
|
import SelPopup from "@/components/sel-popup.vue";
|
|
import SelPopup from "@/components/sel-popup.vue";
|
|
|
import { getWeixinId } from "@/api/invite";
|
|
import { getWeixinId } from "@/api/invite";
|
|
|
-import personComponent from "./components/person";
|
|
|
|
|
import AppActivilyCoupon from "@/components/module/app-activily-coupon";
|
|
import AppActivilyCoupon from "@/components/module/app-activily-coupon";
|
|
|
import { mapGetters } from "vuex";
|
|
import { mapGetters } from "vuex";
|
|
|
export default {
|
|
export default {
|
|
@@ -204,8 +202,7 @@ export default {
|
|
|
allMoreSelectInput,
|
|
allMoreSelectInput,
|
|
|
PxClassCommondity,
|
|
PxClassCommondity,
|
|
|
wangCg,SelPopup,
|
|
wangCg,SelPopup,
|
|
|
- AppActivilyCoupon,
|
|
|
|
|
- personComponent
|
|
|
|
|
|
|
+ AppActivilyCoupon
|
|
|
},
|
|
},
|
|
|
props: {
|
|
props: {
|
|
|
ghsShopAdminId:{
|
|
ghsShopAdminId:{
|
|
@@ -254,7 +251,6 @@ export default {
|
|
|
cartItemShow:false,
|
|
cartItemShow:false,
|
|
|
showClassRemind:false,
|
|
showClassRemind:false,
|
|
|
buyNotice:0,
|
|
buyNotice:0,
|
|
|
- isHd:1,
|
|
|
|
|
getappIdList: {},
|
|
getappIdList: {},
|
|
|
backAction:''
|
|
backAction:''
|
|
|
};
|
|
};
|
|
@@ -516,11 +512,6 @@ export default {
|
|
|
this.ghsId = id
|
|
this.ghsId = id
|
|
|
this.buyNotice = res.data.buyNotice
|
|
this.buyNotice = res.data.buyNotice
|
|
|
//只有注册了和没有列入黑名单才判断他是不是花店身份
|
|
//只有注册了和没有列入黑名单才判断他是不是花店身份
|
|
|
- if(Number(id)>0){
|
|
|
|
|
- if(res.data.black && res.data.black == 1){
|
|
|
|
|
- this.isHd = Number(res.data.isHd)
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
if(this.buyNotice == 1){
|
|
if(this.buyNotice == 1){
|
|
|
this.myClass = 'fadeIn'
|
|
this.myClass = 'fadeIn'
|
|
|
}
|
|
}
|
|
@@ -549,11 +540,6 @@ export default {
|
|
|
this.shopId = res.data.shopId
|
|
this.shopId = res.data.shopId
|
|
|
this.buyNotice = res.data.buyNotice
|
|
this.buyNotice = res.data.buyNotice
|
|
|
//只有注册了和没有列入黑名单才判断他是不是花店身份
|
|
//只有注册了和没有列入黑名单才判断他是不是花店身份
|
|
|
- if(this.option.id && Number(this.option.id)>0){
|
|
|
|
|
- if(res.data.black && res.data.black == 1){
|
|
|
|
|
- this.isHd = Number(res.data.isHd)
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
if(this.buyNotice == 1){
|
|
if(this.buyNotice == 1){
|
|
|
this.myClass = 'fadeIn'
|
|
this.myClass = 'fadeIn'
|
|
|
}
|
|
}
|