LGX 7 months ago
parent 6141cbe043
commit bd5cbe3fda
  1. 20
      components/cartList/index.vue
  2. 39
      pages.json
  3. 353
      pages/annex/vip_paid/index.vue
  4. 39
      pages/goods/order_confirm/index.vue
  5. 8
      pages/goods_cate/template/template3.vue
  6. 16
      pages/index/index.vue
  7. 74
      pages/store/table_code/cart.vue
  8. 1316
      pages/store/table_code/cart1.vue
  9. 32
      pages/store/table_code/index.vue
  10. 9
      pages/user/components/member/template1.vue
  11. 39
      pages/users/user_address_list/index.vue

@ -20,16 +20,16 @@
</view>
<view class="flex-1 flex-col justify-between ml-20">
<view class="w-full">
<view class="lh-40rpx fs-28 text--w111-333 line2"
<view class="lh-40rpx fs-28 colorhui1 line2"
:class="(item.attrStatus && item.status)?'':'on'">{{item.productInfo.store_name}}</view>
<view class="inline-block max-w-460 h-38 lh-38rpx mt-12 bg--w111-f5f5f5 text--w111-999 rd-20rpx px-12 text-center fs-22"
<view class="inline-block max-w-460 h-38 lh-38rpx mt-12 colorhui1 rd-20rpx px-12 text-center fs-22"
v-if="item.productInfo.spec_type && item.attrStatus">
<view class="flex">
<text class="line1">属性: {{item.productInfo.attrInfo.suk}}</text>
<text class="iconfont icon-ic_downarrow fs-24 ml-12"></text>
</view>
</view>
<view class="inline-block max-w-460 h-38 lh-38rpx mt-12 bg--w111-f5f5f5 text--w111-999 rd-20rpx px-12 text-center fs-22"
<view class="inline-block max-w-460 h-38 lh-38rpx mt-12 colorhui1 rd-20rpx px-12 text-center fs-22"
v-else>
<view class="flex">
<text class="line1">属性: {{item.productInfo.attrInfo.suk}}</text>
@ -38,13 +38,13 @@
</view>
</view>
<view class="flex-between-center mt-20">
<baseMoney :money="item.truePrice" symbolSize="24" integerSize="40" decimalSize="24" weight></baseMoney>
<baseMoney :money="item.truePrice" symbolSize="24" integerSize="40" decimalSize="24" weight color='#D64D22'></baseMoney>
<view class="flex-y-center" v-if="item.attrStatus && item.status">
<view class="flex-center w-48 h-48 rd-30rpx bg--w111-f5f5f5 text--w111-333" @click="leaveCart(index)">
<view class="flex-center w-48 h-48 rd-30rpx colorhui1" @click="leaveCart(index)">
<text class="iconfont icon-ic_Reduce fs-32"></text>
</view>
<view class="fs-30 text--w111-333 px-20">{{item.cart_num}}</view>
<view class="flex-center w-48 h-48 rd-30rpx bg-color text--w111-fff" @click="joinCart(index)">
<view class="fs-30 colorhui1 px-20">{{item.cart_num}}</view>
<view class="flex-center w-48 h-48 rd-30rpx colorhui1" @click="joinCart(index)">
<text class="iconfont icon-ic_increase fs-32"></text>
</view>
</view>
@ -128,7 +128,7 @@
left:0;
bottom: 0;
width: 100%;
background-color: #fff;
background-color: #1B1A1D;
z-index:100;
padding: 40rpx 32rpx 0;
padding-bottom: calc(100rpx + constant(safe-area-inset-bottom)); /// IOS<11.2/
@ -151,12 +151,12 @@
margin-bottom: 32rpx;
.name{
font-size:32rpx;
color: #333;
color: #fff;
font-weight:500;
}
.del{
font-size: 24rpx;
color: #666;
color: #fff;
.iconfont{
margin-right: 8rpx;
font-size: 28rpx;

@ -17,8 +17,8 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom",
"navigationBarTextStyle": "black"
"navigationStyle": "custom"
}
},
{
@ -50,7 +50,6 @@
// #ifdef MP || APP-PLUS
"navigationStyle": "custom",
// "navigationBarBackgroundColor": "#e93323",
"navigationBarTextStyle": "black",
// #endif
"app-plus": {
//
@ -126,7 +125,6 @@
"path": "message_center/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "消息中心",
"enablePullDownRefresh": true,
"app-plus": {
@ -142,7 +140,6 @@
"path": "message_center/messageDetail",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "消息中心",
"app-plus": {
// #ifdef APP-PLUS
@ -171,7 +168,6 @@
"path": "user_invoice_list/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "发票管理",
"app-plus": {
// #ifdef APP-PLUS
@ -239,7 +235,6 @@
"path": "user_set/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "设置",
// #ifdef MP || APP-PLUS
"navigationStyle": "custom",
@ -257,7 +252,6 @@
"path": "user_info/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "个人资料",
// #ifdef MP || APP-PLUS
"navigationStyle": "custom",
@ -319,7 +313,6 @@
"path": "user_sgin_list/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "签到记录",
"app-plus": {
// #ifdef APP-PLUS
@ -370,7 +363,6 @@
"style": {
"navigationBarTitleText": "积分明细",
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
@ -421,7 +413,6 @@
// #ifdef MP
,
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF"
// #endif
,
@ -441,7 +432,6 @@
// #ifdef MP
,
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF"
// #endif
,
@ -461,9 +451,6 @@
// #ifndef APP-PLUS
"navigationBarTextStyle": "white",
// #endif
// #ifdef APP-PLUS
"navigationBarTextStyle": "black",
// #endif
"navigationStyle": "custom",
"app-plus": {
// #ifdef APP-PLUS
@ -493,10 +480,8 @@
"navigationBarTitleText": "会员中心",
"navigationBarBackgroundColor": "#232323",
"navigationStyle": "custom"
// #ifdef MP || APP-PLUS
,
"navigationBarTextStyle": "white"
// #endif
,
"app-plus": {
// #ifdef APP-PLUS
@ -543,7 +528,6 @@
"path": "user_agreement_list/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "政策协议",
"app-plus": {
// #ifdef APP-PLUS
@ -641,9 +625,8 @@
// #ifdef MP
,
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTextStyle": "black"
// #endif
,
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
@ -660,7 +643,6 @@
// #ifdef MP
,
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#FFFFFF"
// #endif
,
@ -677,7 +659,6 @@
"path": "promoter_rank/index",
"style": {
"navigationStyle": "custom",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "推广人排行",
"app-plus": {
// #ifdef APP-PLUS
@ -693,7 +674,7 @@
"style": {
"navigationStyle": "custom",
// #ifdef APP-PLUS
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
// #endif
// #ifndef APP-PLUS
"navigationBarTextStyle": "white",
@ -1566,7 +1547,7 @@
"path": "goods_list/index",
"style": {
"navigationBarTitleText": "商品列表",
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationStyle": "custom"
}
},
@ -1622,7 +1603,7 @@
"path": "goods_comment_con/comment_con",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "评价详情",
"app-plus": {
// #ifdef APP-PLUS
@ -1745,7 +1726,7 @@
"path": "cashier/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "订单支付",
"navigationStyle": "custom",
"app-plus": {
@ -1761,7 +1742,7 @@
"path": "order_after_details/index",
"style": {
"navigationBarBackgroundColor": "#f5f5f5",
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "售后详情",
"enablePullDownRefresh": false,
"app-plus": {
@ -1791,7 +1772,7 @@
"path": "user_list/index",
"style": {
"navigationBarTitleText": "代客下单",
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#F5F5F5",
"app-plus": {
// #ifdef APP-PLUS
@ -1889,7 +1870,7 @@
]
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "加载中",
"navigationBarBackgroundColor": "#1B1A1D",
"backgroundColor": "#1B1A1D",

@ -2,26 +2,27 @@
<!-- svip会员模块 -->
<view>
<view class="">
<!-- #ifdef MP -->
<!-- <NavBar titleText="SVIP会员" :iconColor="iconColor" :textColor="iconColor" :isScrolling="isScrolling" showBack>
<!-- #ifdef MP -->
<!-- <NavBar titleText="SVIP会员" :iconColor="iconColor" :textColor="iconColor" :isScrolling="isScrolling" showBack>
</NavBar> -->
<view class="topdaohang" @click="fanhui">
<uni-icons type="left" size="18" color="white"></uni-icons>
<text >会员中心</text>
</view>
<!-- #endif -->
<view class="headerBg"></view>
<view class="vipxinbox">
<image class="vipxinboximg" src="https://bar.jiuhaosh.cn/static/vipxin1.png" mode=""></image>
<view class="vipwzbox">
<view class="yqju" @click="yqju">邀请记录</view>
<view class="title1">随身畅饮卡</view>
<view class="title2">享受折扣{{number}}%</view>
<view class="title2">{{userInfo.pay_vip_status==false?'未领取':"已领取"}} <text v-if="userInfo.pay_vip_status">{{memberEndTime}}到期</text> </view>
<view class="topdaohang" @click="fanhui">
<uni-icons type="left" size="18" color="white"></uni-icons>
<text>会员中心</text>
</view>
</view>
<view class="hyqy">会员权益</view>
<!-- <view class="card-section">
<!-- #endif -->
<view class="headerBg"></view>
<view class="vipxinbox">
<image class="vipxinboximg" src="https://bar.jiuhaosh.cn/static/vipxin1.png" mode=""></image>
<view class="vipwzbox">
<view class="yqju" @click="yqju">邀请记录</view>
<view class="title1">随身畅饮卡</view>
<view class="title2">享受折扣{{number}}%</view>
<view class="title2">{{userInfo.pay_vip_status==false?'未领取':"已领取"}} <text
v-if="userInfo.pay_vip_status">{{memberEndTime}}到期</text> </view>
</view>
</view>
<view class="hyqy">会员权益</view>
<!-- <view class="card-section">
<image src="../static/vip-paid.png" class="vip-paid"></image>
<view class="wrapper">
@ -51,8 +52,8 @@
</view>
</view>
</view> -->
<!-- 选择卡种 -->
<!-- <view class="other-section">
<!-- 选择卡种 -->
<!-- <view class="other-section">
<view class="type-section" id="card" v-if="memberType.length && !userInfo.is_ever_level">
<view class="type-section-inner">
<view class="title acea-row row-between-wrapper">
@ -96,78 +97,64 @@
<recommend class="recommend" title="SVIP商品推荐" :hostProduct="goodsList" saleShow></recommend>
</view>
</view> -->
<view class="quanyibox">
<view class="quanyibox1" @click="gouwu(item)" v-for="(item,index) in memberRights" :key="index">
<image :src="item.image" mode="" class="wh90 quanyibox1img" ></image>
<view class="colorhui1 quanyibox1wz">{{item.title}}</view>
</view>
<!-- <view class="quanyibox1" @click='yaoqing'>
<view class="quanyibox">
<view class="quanyibox1" @click="gouwu(item)" v-for="(item,index) in memberRights" :key="index">
<image :src="item.image" mode="" class="wh90 quanyibox1img"></image>
<view class="colorhui1 quanyibox1wz">{{item.title}}</view>
</view>
<!-- <view class="quanyibox1" @click='yaoqing'>
<image src="@/static/img/邀请xin.png" mode="" class="wh90 quanyibox1img"></image>
<view class="colorhui1 quanyibox1wz">邀请返佣</view>
</view> -->
</view>
<view class="quanyibox">
<view class="quanyibox2" v-for="(item,index) in memberType" :key="index" :class="tykindex==index?'tykxz':'tykxz1'" @click="tykxzindex(index)">
<view class="colorhui1 quanyibox2wz">{{item.title}}</view>
<view class="colorzong">{{item.pre_price}}</view>
</view>
<!-- <view class="quanyibox2">
<view class="quanyibox">
<view class="quanyibox2" v-for="(item,index) in memberType" :key="index"
:class="tykindex==index?'tykxz':'tykxz1'" @click="tykxzindex(index)">
<view class="colorhui1 quanyibox2wz">{{item.title}}</view>
<view class="colorzong">{{item.pre_price}}</view>
</view>
<!-- <view class="quanyibox2">
<view class="colorhui1 quanyibox2wz">邀请返佣</view>
<view class="colorzong">208.00</view>
</view> -->
</view>
<view class="hyqydlbao" v-if="memberType[tykindex].is_libao==1">选择赠送大礼包</view>
<view class="other-section" v-if="memberType[tykindex].is_libao==1">
<view class="type-section" id="card">
<view class="type-section-inner">
<!-- <view class="title acea-row row-between-wrapper">
<view class="">选择卡种</view>
<view class="cash" @click="drawMemberCard">点击兑换卡密</view>
</view> -->
<scroll-view class="scroll" scroll-x="true">
<!-- <view v-for="item in memberType" :key="item.id" class="item" :class="{on: item.id === svip.id}" @click="checkType(item)">
<view v-if="item.is_label" class="badge">限时特惠</view>
<view class="name">{{item.title}}</view>
<view class="new"><text class="num">{{item.pre_price | moneyFormat}}</text></view>
<view class="old">{{item.price | moneyFormat}}</view>
<view class="button">立省{{ $util.$h.Sub(item.price, item.pre_price) }}</view>
</view> -->
<view class="zsbox">
<view class="zsbox1" v-for="(item,index) in newcomer_products" :class="libaoindex==index?'zsbox1xz':'zsbox1'" @click="lbxzclick(index)">
<image class="wh330" :src="item.image" mode=""></image>
<view class="colorfff fs-32 zsboxtitle">{{item.store_name}}</view>
<view class="maleft24">
<text class="colorzong">
{{item.price}}
</text>
<text class="yuanjia">
{{item.ot_price}}
</text>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
<view class="xitext">
<checkbox-group v-model="checkboxValue1" @change='change' >
<label class="radio">
<checkbox value="r1" class="checkbox-backgroun-yellow"/><text class="colorhui1">我已阅读会员用卡协议</text>
</label>
</checkbox-group>
</view>
<view class="" style="background: black; height: 200rpx;padding-top: 30rpx;">
<view class="fotbut" @tap="pay" v-if="memberType[tykindex].is_libao!=1">
付费{{memberType[tykindex].pre_price}} 立即领卡
<view class="hyqydlbao" v-if="memberType[tykindex].is_libao==1">选择赠送大礼包</view>
<!-- <view > -->
<view class="zsbox" v-if="memberType[tykindex].is_libao==1">
<view class="zsbox1" v-for="(item,index) in newcomer_products"
:class="libaoindex==index?'zsbox1xz':'zsbox1'" @click="lbxzclick(index)">
<image class="wh330" :src="item.image" mode=""></image>
<view class="colorfff fs-32 zsboxtitle">{{item.store_name}}</view>
<view class="maleft24">
<text class="colorzong">
{{item.price}}
</text>
<text class="yuanjia">
{{item.ot_price}}
</text>
</view>
</view>
</view>
<!-- </view> -->
<view class="xitext">
<checkbox-group v-model="checkboxValue1" @change='change'>
<label class="radio">
<checkbox value="r1" class="checkbox-backgroun-yellow" /><text
class="colorhui1">我已阅读会员用卡协议</text>
</label>
</checkbox-group>
</view>
<view class="fotbut" @tap="ljlingka" v-else>
立即领卡
<view class="" style="background: black; height: 200rpx;padding-top: 30rpx;">
<view class="fotbut" @tap="pay" v-if="memberType[tykindex].is_libao!=1">
付费{{memberType[tykindex].pre_price}} 立即领卡
</view>
<view class="fotbut" @tap="ljlingka" v-else>
立即领卡
</view>
</view>
</view>
<!-- <view class="" style="height: 48rpx;"></view> -->
<!-- <view class="footer">
<!-- <view class="" style="height: 48rpx;"></view> -->
<!-- <view class="footer">
<view class="acea-row">
<view class="text acea-row row-middle">
<view><text class="symbol">¥</text><text class="number">{{ totalPrice }}</text><text
@ -177,17 +164,18 @@
</view>
</view>
<view class="footer-placeholder"></view> -->
<uni-popup ref="popup" type="center">
<view class="popupbox">
<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close"></text>
<uni-popup ref="popup" type="center">
<view class="popupbox">
<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1"
@click="close"></text>
<view class="popupboxtitle">
{{guzkneirong.title}}
</view>
<view class="neir">
{{guzkneirong.content}}
<view class="neir" v-html="guzkneirong.content">
<!-- {{guzkneirong.content}} -->
</view>
</view>
</uni-popup>
</view>
</uni-popup>
</view>
</view>
</template>
@ -210,8 +198,12 @@
import {
toLogin
} from '@/libs/login.js';
import {newcomerList} from'@/api/api.js'
import {postCartAdd} from'@/api/store.js'
import {
newcomerList
} from '@/api/api.js'
import {
postCartAdd
} from '@/api/store.js'
import {
openPaySubscribe
} from '@/utils/SubscribeMessage.js';
@ -239,14 +231,14 @@
},
data() {
return {
number:0,
newcomer_products:[],
ishyxy:false,
r1:'',
checkboxValue1:'',
guzkneirong:{},
tykindex:0,
libaoindex:0,
number: 0,
newcomer_products: [],
ishyxy: false,
r1: '',
checkboxValue1: '',
guzkneirong: {},
tykindex: 0,
libaoindex: 0,
memberType: [],
userInfo: {},
memberRights: [],
@ -300,65 +292,67 @@
// #endif
},
methods: {
ljlingka(){
ljlingka() {
// this.createMemberCard('weixin');
if(this.ishyxy){
let data={
if (this.ishyxy) {
let data = {
addressId: "",
cartNum: 1,
delivery_type:'',
delivery_type: '',
new: 1,
productId:this.newcomer_products[this.libaoindex].product_id,
store_id:uni.getStorageSync('mendianstore_id'),
productId: this.newcomer_products[this.libaoindex].product_id,
store_id: uni.getStorageSync('mendianstore_id'),
uniqueId: ""
};
postCartAdd(data).then(res=>{
console.log(987,res);
postCartAdd(data).then(res => {
console.log(987, res);
uni.navigateTo({
url:'/pages/goods/order_confirm/index?huiyuanka=1&product_id='
+this.newcomer_products[this.libaoindex].product_id+'&new=1&cartId='
+res.data.cartId+'&huiyuankajiage='+this.memberType[this.tykindex].pre_price
+'&huiyuanzhekou='+this.number+'&vipmoney='+this.memberType[this.tykindex].price
+'&vipprice='+this.memberType[this.tykindex].pre_price
url: '/pages/goods/order_confirm/index?huiyuanka=1&product_id=' +
this.newcomer_products[this.libaoindex].product_id + '&new=1&cartId=' +
res.data.cartId + '&huiyuankajiage=' + this.memberType[this.tykindex]
.pre_price +
'&huiyuanzhekou=' + this.number + '&vipmoney=' + this.memberType[this
.tykindex].price +
'&vipprice=' + this.memberType[this.tykindex].pre_price
})
})
}else{
} else {
this.$util.Tips({
title: '请选择会员卡协议'
})
}
},
getnewcomerList(){
newcomerList().then(res=>{
this.newcomer_products=res.data.newcomer_products
getnewcomerList() {
newcomerList().then(res => {
this.newcomer_products = res.data.newcomer_products
})
},
change(e){
if(e.detail.value.length!=0){
this.ishyxy=true
}else{
this.ishyxy=false
change(e) {
if (e.detail.value.length != 0) {
this.ishyxy = true
} else {
this.ishyxy = false
}
},
tykxzindex(i){
this.tykindex=i
console.log(45,this.memberType[this.tykindex].pre_price);
tykxzindex(i) {
this.tykindex = i
console.log(45, this.memberType[this.tykindex].pre_price);
},
yaoqing(){
yaoqing() {
uni.navigateTo({
url:'/pages/annex/yaoqing/yaoqing'
url: '/pages/annex/yaoqing/yaoqing'
})
},
fanhui(){
fanhui() {
uni.navigateBack()
},
lbxzclick(e){
this.libaoindex=e
lbxzclick(e) {
this.libaoindex = e
},
yqju() {
uni.navigateTo({
url:'/pages/annex/record/record'
url: '/pages/annex/record/record'
})
},
onLunch() {
@ -366,10 +360,10 @@
this.groomList();
},
pay() {
console.log('checkboxValue1',this.r1);
if(this.ishyxy){
console.log('checkboxValue1', this.r1);
if (this.ishyxy) {
this.createMemberCard('weixin');
}else{
} else {
this.$util.Tips({
title: '请选择会员卡协议'
})
@ -406,17 +400,17 @@
this.userInfo = is_get_free.user_info;
this.memberRights = member_rights;
this.memberType = member_type;
this.memberRights.forEach(el=>{
console.log('el',el);
if(el.id=='7'){
this.number=el.number
this.memberRights.forEach(el => {
console.log('el', el);
if (el.id == '7') {
this.number = el.number
}
})
this.memberCoupons = member_coupons;
this.memberExplain = member_explain;
if (is_get_free.is_record) {
this.memberType = this.memberType.filter(item => item.type !== 'free');
};
// if (is_get_free.is_record) {
// this.memberType = this.memberType.filter(item => item.type !== 'free');
// };
this.totalPrice = parseFloat(this.memberType[0].pre_price);
this.type = this.memberType[0].type;
this.totalPrice = parseFloat(this.memberType[0].pre_price);
@ -497,7 +491,7 @@
member_type: this.memberType[this.tykindex].id,
price: this.memberType[this.tykindex].pre_price,
money: this.memberType[this.tykindex].price,
libao_id:this.newcomer_products[this.libaoindex].product_id
libao_id: this.newcomer_products[this.libaoindex].product_id
// #ifdef H5
quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location.port +
'/pages/annex/vip_paid/index' : location.protocol + '//' + location.hostname +
@ -520,12 +514,12 @@
// });
// }
uni.hideLoading()
if(this.memberType[this.tykindex].is_libao!=1){
if (this.memberType[this.tykindex].is_libao != 1) {
uni.redirectTo({
url: `/pages/goods/cashier/index?order_id=${res.data.order_id}&from_type=vip`
})
}
}).catch(err => {
uni.showToast({
title: err
@ -552,33 +546,35 @@
url: `/pages/annex/vip_paid_rights/index`
});
},
gouwu(item){
if(item.id=='7'){
this.$refs.popup.open('center')
this.guzkneirong=item
}else{
gouwu(item) {
if (item.id == '7') {
this.$refs.popup.open('center')
this.guzkneirong = item
} else {
this.yaoqing()
}
},
close(){
this.$refs.popup.close('center')
close() {
this.$refs.popup.close('center')
},
}
}
</script>
<style lang="scss" scoped>
.tykxz{
.tykxz {
border: 1px solid #F8A617;
}
.popupbox{
.popupbox {
width: 600rpx;
height: 400rpx;
background: #28282A;
border-radius: 20rpx;
padding: 34rpx;
.popupboxtitle{
.popupboxtitle {
text-align: center;
font-family: Alibaba PuHuiTi;
font-weight: 400;
@ -587,7 +583,8 @@
margin-top: 40rpx;
margin-bottom: 47rpx;
}
.neir{
.neir {
font-family: Alibaba PuHuiTi;
font-weight: 400;
font-size: 24rpx;
@ -595,7 +592,8 @@
line-height: 30rpx;
}
}
.fotbut{
.fotbut {
width: 702rpx;
height: 90rpx;
background: #F8A617;
@ -609,12 +607,16 @@
color: #080313;
margin-bottom: 48rpx;
}
.xitext{
.xitext {
text-align: center;
margin-top: 63rpx;
padding-top: 70rpx;
background: black;
margin-top: -35rpx;
// margin-bottom: 34rpx;
}
.yuanjia{
.yuanjia {
font-family: Alibaba PuHuiTi;
font-weight: 400;
font-size: 24rpx;
@ -623,21 +625,24 @@
margin-top: 24rpx;
margin-left: 24rpx;
}
.zsbox1{
.zsbox1 {
margin-right: 50rpx;
width: 340rpx;
height: 470rpx;
background: #1B1A1D;
border-radius: 20rpx;
}
.zsbox1xz{
.zsbox1xz {
// margin-right: 50rpx;
// width: 340rpx;
// height: 470rpx;
// background: #1B1A1D;
// border-radius: 20rpx;
border: 1px solid #F8A617;
border: 1px solid #F8A617;
}
.zsbox {
// width: 340rpx;
// height: 470rpx;
@ -645,23 +650,28 @@
// border-radius: 20rpx;
// border: 2px solid #F8A617;
display: flex;
margin-left: 24rpx;
// height: 470rpx;
}
.zsboxtitle{
.zsboxtitle {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
margin-left: 24rpx;
}
.maleft24{
margin-left: 24rpx;
.maleft24 {
margin-left: 24rpx;
}
.quanyibox {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
width: 700rpx;
margin-left: 24rpx;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
width: 700rpx;
margin-left: 24rpx;
}
.quanyibox1 {
@ -718,6 +728,7 @@
height: 280rpx;
margin: 0 auto;
margin-top: 50rpx;
.vipxinboximg {
width: 702rpx;
height: 280rpx;

@ -778,6 +778,16 @@
this.huiyuanzhekou=options.huiyuanzhekou
this.vipmoney=options.vipmoney
this.vipprice=options.vipprice
uni.setStorage({
key:'ishuiyuanka',
data: [{
huiyuanka:options.huiyuanka,
huiyuankajiage:options.huiyuankajiage,
huiyuanzhekou:options.huiyuanzhekou,
vipmoney:options.vipmoney,
vipprice:options.vipprice
}]
})
console.log('111options', options);
// this.getLocation();
// #ifdef H5
@ -1459,12 +1469,37 @@
'&couponId=' +
this.couponId +
'&store_id=' +
this.storeId;
this.storeId+
'&huiyuanka=' +
this.huiyuanka +
'&huiyuankajiage=' +
this.huiyuankajiage+
'&huiyuanzhekou=' +
this.huiyuanzhekou+
'&vipmoney=' +
this.vipmoney+
'&vipprice=' +
this.vipprice
// this.huiyuanka=options.huiyuanka
// this.huiyuankajiage=options.huiyuankajiage
// this.huiyuanzhekou=options.huiyuanzhekou
// this.vipmoney=options.vipmoney
// this.vipprice=options.vipprice
} else {
uni.navigateTo({
url: '/pages/users/user_address/index?new=' + this.news + '&cartId=' + this.cartId +
'&pinkId=' +
this.pinkId + '&couponId=' + this.couponId + '&store_id=' + this.storeId
this.pinkId + '&couponId=' + this.couponId + '&store_id=' + this.storeId+'&huiyuanka=' +
this.huiyuanka +
'&huiyuankajiage=' +
this.huiyuankajiage+
'&huiyuanzhekou=' +
this.huiyuanzhekou+
'&vipmoney=' +
this.vipmoney+
'&vipprice=' +
this.vipprice
})
}
},

@ -140,26 +140,26 @@
decimalSize="24" weight color='#D64D22'>
</baseMoney>
</view>
<view class="flex-center w-48 h-48 rd-30rpx bg-color text--w111-fff"
<view class="flex-center w-48 h-48 rd-30rpx colorhui1"
@tap.stop="goCartDuo(item)" v-if="item.spec_type">
<!-- <text class="iconfont icon-ic_ShoppingCart1 fs-30"></text> -->
<image src="@/static/img/flgwc.png" mode="" class="wh44"></image>
</view>
<view v-if="!item.spec_type && !item.cart_num">
<view
class="flex-center w-48 h-48 rd-30rpx bg-color text--w111-fff "
class="flex-center w-48 h-48 rd-30rpx colorhui1 "
@tap.stop="goCartDan(item,index)">
<image src="@/static/img/flgwc.png" mode="" class="wh44"></image>
</view>
</view>
<view class="flex-y-center" v-if="!item.spec_type && item.cart_num">
<view
class="flex-center w-48 h-48 rd-30rpx bg--w111-f5f5f5 text--w111-333"
class="flex-center w-48 h-48 rd-30rpx colorhui1"
@tap.stop="ChangeCartNumDan(false,index,item)">
<text class="iconfont icon-ic_Reduce fs-32"></text>
</view>
<view class="fs-30 colorfff px-20">{{item.cart_num}}</view>
<view class="flex-center w-48 h-48 rd-30rpx bg-color text--w111-fff"
<view class="flex-center w-48 h-48 rd-30rpx colorhui1"
@tap.stop="CartNumAdd(index,item)">
<text class="iconfont icon-ic_increase fs-32"></text>
</view>

@ -132,13 +132,19 @@
<uni-popup ref="popup" type="center">
<view class="popupbox">
<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close"></text>
<view class="neir">
<view class="neir" v-if='userInfo.overdue_day>0'>
您的会员卡 <text v-if="userInfo.overdue_day>0">还有{{userInfo.overdue_day}}日到期</text>
<text v-else>已到期</text>
<br />
请尽快续费哦~
</view>
<view class="huiyuanbtn" @click="chuiyuan">立即续费</view>
<view class="neir" v-else>
购买会员享优惠
</view>
<view class="huiyuanbtn" @click="chuiyuan" v-if='userInfo.overdue_day>0'>立即续费</view>
<view class="huiyuanbtn" @click="chuiyuan" v-else>
立即购买
</view>
</view>
</uni-popup>
</view>
@ -468,7 +474,9 @@
console.log(156,this.userInfo)
this.$refs.popup.open('center')
}
}
if(!this.userInfo.overdue_day){
this.$refs.popup.open('center')
}
if(uni.getStorageSync('mdnane')!=''){
uni.setStorageSync('mendianstore_id','')
@ -485,7 +493,7 @@
methods: {
saoma(){
uni.navigateTo({
url:'/pages/store/table_code/index?store_id=1&qrcode_id=1'
url:'/pages/store/table_code/index?store_id=1&qrcode_id=2'
})
},
getLocation(){

@ -21,14 +21,14 @@
<view class="title">营业时间{{info.day_end}}-{{info.day_start}}</view>
<view class="title1">
<text class="iconfont icon-ic_location1" style="padding-right: 61rpx;"></text>
<text class="iconfont icon-ic_Phone"></text>
<text class="iconfont icon-ic_Phone" @click="boda"></text>
</view>
</view>
<view class="mendianbox3">
<view class="title">距您{{address.distance}}km | {{address.address}}</view>
<view class="title1">
<text style="padding-right: 36rpx;">地图</text>
<text >客服</text>
<text @click="boda">客服</text>
</view>
</view>
</view>
@ -103,6 +103,18 @@
</view>
<view class="mask" @click="closeTap"></view>
</view>
<uni-popup ref="popup" type="center">
<view class="popupbox">
<text style="float: right;" class="iconfont iconfont icon-ic_close fs-44 colorhui1" @click="close"></text>
<image src="https://bar.jiuhaosh.cn/static/sbgx.png" mode="" class="popupboximg"></image>
<view class="neir">
购买商品需要成为会员
<br />
才可以购买哦~
</view>
<view class="huiyuanbtn" @click="chuiyuan">我要充会员</view>
</view>
</uni-popup>
</view>
</template>
@ -240,9 +252,15 @@
that.isWidth = e.windowWidth / 5
}
});
console.log(123,uni.getStorageSync('pay_vip_status'));
},
methods: {
boda(){
uni.makePhoneCall({
phoneNumber: this.info.phone //
});
},
//
mendiangetStoreData(store_id){
var that=this
@ -373,8 +391,19 @@
}
})
},
chuiyuan(){
uni.navigateTo({
url:'/pages/annex/vip_paid/index'
})
},
close(){
this.$refs.popup.close('center')
},
//
subOrder: function() {
if(!uni.getStorageSync('pay_vip_status')){
this.$refs.popup.open('center')
}else{
placeOrder({
tableId: this.info.tableId,
storeId: this.info.store_id,
@ -387,6 +416,7 @@
title: err
});
});
}
},
//
getTotalPrice: function() {
@ -450,6 +480,7 @@
})
},
getCartLists() {
console.log('this.footerOpen',this.footerOpen);
if (this.footerOpen) {
this.getCartList();
} else {
@ -875,7 +906,42 @@
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.popupbox{
width: 600rpx;
height: 500rpx;
background: #1C1A1F;
box-shadow: 0rpx 5rpx 16rpx 0rpx rgba(6,3,14,0.39);
border-radius: 20rpx;
padding: 20rpx;
text-align: center;
.popupboximg{
width: 171rpx;
height: 189rpx;
margin: 0 auto;
}
.neir{
font-family: Alibaba PuHuiTi;
font-weight: 400;
font-size: 36rpx;
color: #FFFFFF;
line-height: 56rpx;
text-align: center;
}
.huiyuanbtn{
width: 400rpx;
height: 80rpx;
background: #F8BF1F;
border-radius: 40rpx;
margin: 50rpx auto;
font-family: Alibaba PuHuiTi;
font-weight: 400;
font-size: 30rpx;
text-align: center;
color: #080313;
line-height: 80rpx;
}
}
.mendianbox{
width: 702rpx;
background: #1B1A1D;

File diff suppressed because it is too large Load Diff

@ -24,6 +24,9 @@
</template>
<script>
import {
getUserInfo
} from '@/api/user.js';
import {
mapGetters
} from 'vuex';
@ -36,6 +39,7 @@
isTableCode,
changeTable,
getStoreData,
getCodeData
} from '@/api/store.js';
import {
toLogin
@ -50,12 +54,14 @@
mixins: [colors],
data() {
return {
number_diners:'',
info: {},
number: 0,
inputNumber: '',
popupVisible: -1,
pageVisible: true,
inputFocus: false,
pay_vip_status:false
}
},
watch: {
@ -84,6 +90,7 @@
this.info.tableId = 0;
if (this.isLogin) {
this.getTableData();
this.getUserInfo()
} else {
toLogin()
}
@ -92,6 +99,14 @@
this.pageVisible = false;
},
methods: {
getUserInfo(){
getUserInfo().then(res => {
console.log(121,res)
this.pay_vip_status=res.data.pay_vip_status
uni.setStorageSync('pay_vip_status','')
uni.setStorageSync('pay_vip_status',this.pay_vip_status)
})
},
//
getTableData() {
getTableData({
@ -183,7 +198,14 @@
success: (res) => {
console.log(12112,res);
if (res.confirm) {
this.changeTable();
//
getCodeData({
tableId:this.info.tableId
}).then(res => {
console.log('获取桌码信息',this.number_diners)
this.number_diners=res.data.number_diners
this.changeTable();
});
} else {
this.getStore();
}
@ -203,9 +225,13 @@
}
});
},
//
async changeTable() {
const y_tableId = await this.addTableCode();
console.log('this.info.tableId',this.info.tableId);
console.log('获取桌码信息1',this.number_diners)
const y_tableId = await this.addTableCode(this.number_diners);
console.log('y_tableId',y_tableId);
if (!y_tableId) {
return;
}
@ -232,7 +258,7 @@
...this.info,
...res.data
};
console.log('this.$refs.refresh2',this);
this.$refs.refresh2.getAllCategory();
});
},

@ -27,8 +27,10 @@ export default {
<view class="name-wrap">
<view class="name display-add" v-if="!userInfo.uid" @click="openAuto">请点击授权</view>
<view class="name" v-if="userInfo.uid">{{ userInfo.nickname }}</view>
<view class="bind-phone" v-if="!userInfo.phone" @tap="bindPhone">绑定手机号</view>
<view class="phone" v-else>{{ perShowType ? 'ID' + userInfo.uid : userInfo.phone }}</view>
<view class="bind-phone" v-if="userInfo.pay_vip_status">
<image src="https://bar.jiuhaosh.cn/static/pay_vip.png" mode="" style="width: 90rpx;height: 40rpx;"></image>
</view>
<view class="phone" v-else>普通用户</view>
</view>
<view class="acea-row row-middle">
<text class="iconfont icon-a-ic_QRcode fs-40" @click="tapQrCode"><text class="tips">会员码</text></text>
@ -91,15 +93,12 @@ export default {
.bind-phone {
margin-top: 12rpx;
background: rgba(255, 255, 255, 0.3);
border-radius: 30px;
width: max-content;
text-align: center;
font-size: 20rpx;
font-weight: 400;
color: #ffffff;
line-height: 28rpx;
padding: 6rpx 16rpx;
}
.tips::before {

@ -111,6 +111,12 @@
},
computed: mapGetters(['isLogin']),
onLoad(options) {
console.log(858,options);
this.huiyuanka=options.huiyuanka
this.huiyuankajiage=options.huiyuankajiage
this.huiyuanzhekou=options.huiyuanzhekou
this.vipmoney=options.vipmoney
this.vipprice=options.vipprice
this.cartId = options.cartId || '';
this.noCoupon = options.noCoupon || 0;
this.pinkId = options.pinkId || 0;
@ -313,7 +319,16 @@
url: '/pages/users/user_address/index?id=' + id + '&cartId=' + cartId + '&pinkId=' +
pinkId + '&couponId=' +
couponId + '&new=' + this.news + '&delivery_type=' + this.deliveryType + '&store_id=' + this.storeId + '&store_name=' + this.store_name + '&product_id=' + this
.product_id
.product_id+'&huiyuanka=' +
this.huiyuanka +
'&huiyuankajiage=' +
this.huiyuankajiage+
'&huiyuanzhekou=' +
this.huiyuanzhekou+
'&vipmoney=' +
this.vipmoney+
'&vipprice=' +
this.vipprice
})
},
/**
@ -352,7 +367,16 @@
uni.navigateTo({
url: '/pages/users/user_address/index?cartId=' + cartId + '&pinkId=' + pinkId +
'&couponId=' + couponId + '&new=' + this.news + '&delivery_type=' + this.deliveryType + '&store_id=' + this.storeId + '&store_name=' + this.store_name +
'&product_id=' + this.product_id
'&product_id=' + this.product_id+'&huiyuanka=' +
this.huiyuanka +
'&huiyuankajiage=' +
this.huiyuankajiage+
'&huiyuanzhekou=' +
this.huiyuanzhekou+
'&vipmoney=' +
this.vipmoney+
'&vipprice=' +
this.vipprice
})
},
goOrder: function(id) {
@ -371,7 +395,16 @@
cartId + '&addressId=' + id + '&pinkId=' +
pinkId + '&couponId=' + couponId +
'&noCoupon=' + this.noCoupon + '&delivery_type=' + this.deliveryType + '&store_id=' + this.storeId + '&store_name=' + this.store_name + '&product_id=' + this
.product_id
.product_id+'&huiyuanka=' +
this.huiyuanka +
'&huiyuankajiage=' +
this.huiyuankajiage+
'&huiyuanzhekou=' +
this.huiyuanzhekou+
'&vipmoney=' +
this.vipmoney+
'&vipprice=' +
this.vipprice
})
}
}

Loading…
Cancel
Save