main
yangsai 2 months ago
parent 6948f573e2
commit 7d982b25f1
  1. 2
      components/goodClass/index.vue
  2. 2
      manifest.json
  3. 3
      pages/annex/vip_clause/index.vue
  4. 2
      pages/goods_cate/template/template3.vue
  5. 2
      pages/index/components/hotspot.vue
  6. 17
      pages/index/components/pictureCube.vue
  7. 16
      pages/index/index.vue
  8. 141
      pages/lanhu_zhuye1/index.vue
  9. 16
      pages/store/table_code/cart.vue
  10. 8
      pages/store/table_code/index.vue
  11. 12
      pages/users/lanhu/lanhu_cunqujiu/index.vue
  12. 20
      pages/users/wechat_login/index.vue
  13. 4
      utils/util.js

@ -12,7 +12,7 @@
:circle="!!label.border_color" :imgSrc="label.icon"></BaseTag> :circle="!!label.border_color" :imgSrc="label.icon"></BaseTag>
</view> </view>
<view class="bottom acea-row row-between-wrapper"> <view class="bottom acea-row row-between-wrapper">
<BaseMoney :money="item.price" symbolSize="28" integerSize="44" decimalSize="28" color='#D64D22'></BaseMoney> <BaseMoney :money="item.price" symbolSize="24" integerSize="32" decimalSize="24" color='#D64D22'></BaseMoney>
<template v-if="item.stock>0"> <template v-if="item.stock>0">
<view class="btn-box" <view class="btn-box"
v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3')) || item.product_type!=0 || item.custom_form.length || item.is_presale_product"> v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3')) || item.product_type!=0 || item.custom_form.length || item.is_presale_product">

@ -1,6 +1,6 @@
{ {
"name" : "九号笙活", "name" : "九号笙活",
"appid" : "__UNI__C6407EF", "appid" : "__UNI__DCB3062",
"description" : "多门店", "description" : "多门店",
"versionName" : "3.0.0", "versionName" : "3.0.0",
"versionCode" : 303, "versionCode" : 303,

@ -64,7 +64,8 @@
} }
.box{ .box{
background: linear-gradient(to bottom, #a31de0 0%, #120F0E 50%), linear-gradient(to right, #31173D, #120F0E); /* background: linear-gradient(to bottom, #a31de0 0%, #120F0E 50%), linear-gradient(to right, #31173D, #120F0E); */
background-image: url(https://bar.jiuhaosh.cn/uploads/attach/2024/09/20240927/8b121e2.png);
background-blend-mode: multiply; background-blend-mode: multiply;
} }
</style> </style>

@ -128,6 +128,7 @@
</view> </view>
</view> </view>
<text class="fs-24 text--w111-8e8e8e pl-12">已售{{item.sales}}</text> <text class="fs-24 text--w111-8e8e8e pl-12">已售{{item.sales}}</text>
<text class="px-8 fs-22">¥{{item.price}}</text>
<view class="flex-between-center pl-12"> <view class="flex-between-center pl-12">
<view class="flex items-baseline"> <view class="flex items-baseline">
<text style="background: linear-gradient(90deg, #484643 0%, #1F1B17 100%);color:#FDDAA4;border-radius: 14rpx 0 8rpx 14rpx;" class="inline-block h-26 lh-28rpx svip_rd fs-18 bg--w111-484643 text--w111-FDDAA4 px-8">SVIP</text> <text style="background: linear-gradient(90deg, #484643 0%, #1F1B17 100%);color:#FDDAA4;border-radius: 14rpx 0 8rpx 14rpx;" class="inline-block h-26 lh-28rpx svip_rd fs-18 bg--w111-484643 text--w111-FDDAA4 px-8">SVIP</text>
@ -135,7 +136,6 @@
decimalSize="24" weight color='#D64D22'> decimalSize="24" weight color='#D64D22'>
</baseMoney> </baseMoney>
<text class="px-8 fs-22">¥{{item.price}}</text>
</view> </view>
<view class="flex-center w-48 h-48 rd-30rpx colorhui1" <view class="flex-center w-48 h-48 rd-30rpx colorhui1"
@tap.stop="goCartDuo(item)" v-if="item.spec_type"> @tap.stop="goCartDuo(item)" v-if="item.spec_type">

@ -1,7 +1,7 @@
<template> <template>
<view :style="[hotspotWrapStyle]"> <view :style="[hotspotWrapStyle]">
<view class="hotspot"> <view class="hotspot">
<image :src="dataConfig.picStyle.url" mode="widthFix" class="image" :style="[imageRadius]"></image> <image :src="dataConfig.picStyle.url" mode="widthFix" class="image" :style="[imageRadius]" ></image>
<view v-for="(item, index) in dataConfig.picStyle.list" :key="item.number" :style="{ <view v-for="(item, index) in dataConfig.picStyle.list" :key="item.number" :style="{
top: `${item.starY}rpx`, top: `${item.starY}rpx`,
left: `${item.starX}rpx`, left: `${item.starX}rpx`,

@ -3,8 +3,9 @@
<view class="pictureCube" :style="{ <view class="pictureCube" :style="{
padding: `0 ${dataConfig.prConfig.val*2}rpx`, padding: `0 ${dataConfig.prConfig.val*2}rpx`,
marginTop: `${dataConfig.mbConfig.val*2}rpx`, marginTop: `${dataConfig.mbConfig.val*2}rpx`,
background: dataConfig.bottomBgColor.color[0].item background: `transparent`,
}" v-if="picList.length"> }" v-if="picList.length">
<!-- background: dataConfig.bottomBgColor.color[0].item -->
<view class="advert1" v-if="style==0"> <view class="advert1" v-if="style==0">
<view class="item" v-for="(item,index) in picList" :key="index" :style="[imgGap]" @click="goDetail(item)"> <view class="item" v-for="(item,index) in picList" :key="index" :style="[imgGap]" @click="goDetail(item)">
<easy-loadimage mode="widthFix" width="100%" :height="imageH + 'px'" :image-src="item.image" class="image" :borderRadius="imgBorderRadius"></easy-loadimage> <easy-loadimage mode="widthFix" width="100%" :height="imageH + 'px'" :image-src="item.image" class="image" :borderRadius="imgBorderRadius"></easy-loadimage>
@ -123,7 +124,8 @@
<easy-loadimage mode="aspectFill" width="100%" :height="imageH + 'px'" :image-src="picList[0].image" class="image" :borderRadius="imgBorderRadius"></easy-loadimage> <easy-loadimage mode="aspectFill" width="100%" :height="imageH + 'px'" :image-src="picList[0].image" class="image" :borderRadius="imgBorderRadius"></easy-loadimage>
</view> </view>
</view> </view>
<view class="advert12" :style="[autoHeight]" v-else-if="style==11"> <!-- <view class="advert12" :style="[autoHeight]" v-else-if="style==11" > -->
<view class="advert12" style="height: 280px;" v-else-if="style==11" >
<template v-if="dataConfig.picStyle.docPicList.length"> <template v-if="dataConfig.picStyle.docPicList.length">
<view v-for="(item,index) in dataConfig.picStyle.docPicList" :key="index" :style="{ <view v-for="(item,index) in dataConfig.picStyle.docPicList" :key="index" :style="{
top: `${item.doc.startY*2}rpx`, top: `${item.doc.startY*2}rpx`,
@ -131,7 +133,7 @@
width: `${item.doc.w*2}rpx`, width: `${item.doc.w*2}rpx`,
height: `${item.doc.h*2}rpx`, height: `${item.doc.h*2}rpx`,
borderWidth: `${dataConfig.imgConfig.val*2}rpx`, borderWidth: `${dataConfig.imgConfig.val*2}rpx`,
}" class="item" @click="goDetail(item)"> }" class="item" @click="goDetail(item)" v-if='index!=8'>
<easy-loadimage mode="aspectFill" width="100%" height="100%" :imageSrc="item.img" class="image" :borderRadius="imgBorderRadius"></easy-loadimage> <easy-loadimage mode="aspectFill" width="100%" height="100%" :imageSrc="item.img" class="image" :borderRadius="imgBorderRadius"></easy-loadimage>
</view> </view>
</template> </template>
@ -199,10 +201,11 @@
}, },
goDetail(url) { goDetail(url) {
let urls = url.link; let urls = url.link;
uni.navigateTo({ // uni.navigateTo({
url: urls // url: urls
}) console.log(urls)
// this.$util.JumpPath(urls); // })
this.$util.JumpPath(urls);
}, },
computedHeight(){ computedHeight(){
if(this.picList.length){ if(this.picList.length){

@ -5,13 +5,13 @@
<view class="xuanzmd"> <view class="xuanzmd">
<text @click="xuzemd">{{mrmd}}</text> <text @click="xuzemd">{{mrmd}}</text>
<uni-icons type="right" size="16" color="white"></uni-icons> <uni-icons type="right" size="16" color="white"></uni-icons>
<text class="sytitle" @click='saoma'>首页</text> <text class="sytitle" >首页</text>
</view> </view>
<view class="input-container"> <!-- <view class="input-container">
<input class="inputserch" placeholder="搜索喜欢的商品" prefixIcon="search" v-model="searchValue"/> <input class="inputserch" placeholder="搜索喜欢的商品" prefixIcon="search" v-model="searchValue"/>
<uni-icons class="inputicon" type="search" size="16" color="white"></uni-icons> <uni-icons class="inputicon" type="search" size="16" color="white"></uni-icons>
<view class="searchright" @click="searchBut">搜索</view> <view class="searchright" @click="searchBut">搜索</view>
</view> </view> -->
<view v-if="!errorNetwork" :style="colorStyle"> <view v-if="!errorNetwork" :style="colorStyle">
<!-- 轮播搜索 --> <!-- 轮播搜索 -->
<homeComb v-if="showHomeComb" :dataConfig="homeCombData" @bindSortId="bindSortId" :isScrolled="isScrolled"> <homeComb v-if="showHomeComb" :dataConfig="homeCombData" @bindSortId="bindSortId" :isScrolled="isScrolled">
@ -502,11 +502,11 @@
}, },
onReady() {}, onReady() {},
methods: { methods: {
// saoma(){ saoma(){
// uni.navigateTo({ uni.navigateTo({
// url:'/pages/store/table_code/index?store_id=1&qrcode_id=3' url:'/pages/users/lanhu/lanhu_zuoweiyuding/index',
// }) })
// }, },
onInput(e){ onInput(e){
this.bdphone = e.target.value; this.bdphone = e.target.value;
}, },

@ -9,7 +9,7 @@
</image> </image>
<view class="group_2 flex-col"> <view class="group_2 flex-col" v-for="(item, index) in storeList">
<view class="box_1 flex-row justify-between"> <view class="box_1 flex-row justify-between">
<text class="text_1">九号笙活&nbsp;No.9&nbsp;Night&nbsp;life</text> <text class="text_1">九号笙活&nbsp;No.9&nbsp;Night&nbsp;life</text>
<view class="image-text_1 flex-col justify-between"> <view class="image-text_1 flex-col justify-between">
@ -22,25 +22,25 @@
<view class="text-wrapper_1 flex-col"> <view class="text-wrapper_1 flex-col">
<text class="text_2">营业中</text> <text class="text_2">营业中</text>
</view> </view>
<text class="text_3">营业时间:19:59-05:30</text> <text class="text_3">营业时间:{{item.day_time}}</text>
</view> </view>
<image class="image_1" @click="go1" <image class="image_1" @click="go1"
src="http://118.89.89.96/lanhu_zhuye1/ps7o5jktbhk7vl9wqte3bixrmbii6g06cpe313eb71-f2d8-43b3-b134-e7104de4f8c4.png" /> src="http://118.89.89.96/lanhu_zhuye1/ps7o5jktbhk7vl9wqte3bixrmbii6g06cpe313eb71-f2d8-43b3-b134-e7104de4f8c4.png" />
<view class="image-text_2 flex-row justify-between"> <view class="image-text_2 flex-row justify-between">
<image class="label_2" referrerpolicy="no-referrer" <image class="label_2" referrerpolicy="no-referrer"
src="http://118.89.89.96/lanhu_zhuye1/ps50aro0kmoakynt2s60ho3ade2pushkacbd4b06b0-fb24-4171-b9b0-809e906a4776.png" /> src="http://118.89.89.96/lanhu_zhuye1/ps50aro0kmoakynt2s60ho3ade2pushkacbd4b06b0-fb24-4171-b9b0-809e906a4776.png" />
<text class="text-group_2">安徽省合肥市包河区大宁缤购商业中心</text> <text class="text-group_2">{{item.address}}{{item.detailed_address}}</text>
</view> </view>
<view class="box_3 flex-row"> <view class="box_3 flex-row">
<view class="image-text_3 flex-row justify-between"> <view class="image-text_3 flex-row justify-between">
<image class="label_3" referrerpolicy="no-referrer" <image class="label_3" referrerpolicy="no-referrer"
src="http://118.89.89.96/lanhu_zhuye1/psxreqyy5b7l3bo3wo6uyvu6x5l5xmsv0c9936a580-660a-40f9-a818-dba31bb8f743.png" /> src="http://118.89.89.96/lanhu_zhuye1/psxreqyy5b7l3bo3wo6uyvu6x5l5xmsv0c9936a580-660a-40f9-a818-dba31bb8f743.png" />
<text class="text-group_3">查看导航</text> <text class="text-group_3" @click.stop="showMaoLocation(item)">查看导航</text>
</view> </view>
<view class="image-text_4 flex-row justify-between"> <view class="image-text_4 flex-row justify-between">
<image class="label_4" referrerpolicy="no-referrer" <image class="label_4" referrerpolicy="no-referrer"
src="http://118.89.89.96/lanhu_zhuye1/psewr4akzugt8q6xhv9sq2dtipwt4f4ov9e6740a42-c1c6-43ca-9b91-16b2d33bad0a.png" /> src="http://118.89.89.96/lanhu_zhuye1/psewr4akzugt8q6xhv9sq2dtipwt4f4ov9e6740a42-c1c6-43ca-9b91-16b2d33bad0a.png" />
<text class="text-group_4">客服电话</text> <text class="text-group_4" @click.stop="callPhone(item)">客服电话</text>
</view> </view>
<view class="image-text_5 flex-row justify-between"> <view class="image-text_5 flex-row justify-between">
<image class="label_5" referrerpolicy="no-referrer" <image class="label_5" referrerpolicy="no-referrer"
@ -49,17 +49,17 @@
</view> </view>
</view> </view>
</view> </view>
<view class="group_3 flex-col"> <view class="group_3 flex-col" v-for="(item, index) in storeList" >
<view class="text-group_6 flex-col justify-between"> <view class="text-group_6 flex-col justify-between">
<text class="text_4">品牌介绍</text> <text class="text_4">品牌介绍</text>
<text class="text_5">Brand&nbsp;Introduction</text> <text class="text_5">Brand&nbsp;Introduction</text>
</view> </view>
<text class="text_6" style="font-size:12px;"> <text class="text_6" style="font-size:12px;" >
在凡客纳伯投资有限公司旗下品牌Club&nbsp;Miracle与夜光Luminous&nbsp;Party.K相继破圈之后凡客纳伯集团全新品牌九号笙活强势入驻合肥打破品牌与客户最后一档防线九号笙活会员店是一家集酒吧餐饮酒水平价超市潮牌为主题的生活体验馆以更多不同的玩乐模式筑造城市娱乐综合平台更深度的与客户捆绑为客户的夜生活提供全方位的选择 {{!item.pinpaicontent?'':item.pinpaicontent}}
</text> </text>
<view class="image-wrapper_1 flex-row"> <view class="image-wrapper_1 flex-row">
<image class="image_2" referrerpolicy="no-referrer" :src="item.lanhuimage0" <image class="image_2" referrerpolicy="no-referrer" :src="itemimg"
v-for="(item, index) in loopData0" :key="index" /> v-for="(itemimg, imgindex) in item.pingpai_img" :key="imgindex" />
</view> </view>
</view> </view>
<!-- 轮播图 --> <!-- 轮播图 -->
@ -71,6 +71,15 @@
</view> </view>
</template> </template>
<script> <script>
import {
HTTP_REQUEST_URL
} from '@/config/app';
import colors from "@/mixins/color";
import {
getList
} from '@/api/new_store.js';
import areaWindow from '@/components/areaWindow';
import emptyPage from '@/components/emptyPage.vue';
export default { export default {
data() { data() {
return { return {
@ -84,16 +93,126 @@
lanhuimage0: 'http://118.89.89.96/lanhu/8.png' lanhuimage0: 'http://118.89.89.96/lanhu/8.png'
} }
], ],
constants: {} storeList:[],
constants: {},
inputtext:'',
imgHost: HTTP_REQUEST_URL,
getHeight: this.$util.getWXStatusHeight(),
navList:[
{name:'附近',type:1},
{name:'常用',type:2}
],
storeList:[],
content: {
//
latitude: uni.getStorageSync('user_latitude'),
longitude: uni.getStorageSync('user_longitude'),
store_type: 1,
keyword: "",
province: 0,
city: 0,
area: 0,
},
contentmendian: {
//
latitude:'',
longitude:'',
store_type: 1,
keyword: "",
province: 0,
city: 0,
area: 0,
},
mdlist:'',
mrmd:'',
mdid:'',
display: false,
addressInfo: [],
sortIndex: 0,
comeType: 0,
isCollage:0
}; };
}, },
onLoad(options) {
uni.setStorageSync('isCollagemendian',options.storeId)
this.comeType = options.type
this.sortIndex = options.storeId
this.isCollage = options.isCollage
console.log('this.isCollage',this.isCollage);
this.content.product_id = options.product_id || 0
this.getlist()
},
onShow() {
this.getLocation()
},
methods: { methods: {
go1() { go1() {
console.log(123) console.log(123)
uni.switchTab({ uni.switchTab({
url: '/pages/index/index' url: '/pages/index/index'
}); });
},
getlist() {
getList(this.content).then(res => {
this.storeList = res.data
})
},
//
callPhone(row) {
uni.makePhoneCall({
phoneNumber: row.phone
});
},
showMaoLocation(e) {
let self = this;
// #ifdef H5
if (self.$wechat.isWeixin()) {
return self.$wechat.seeLocation({
latitude: Number(e.latitude),
longitude: Number(e.longitude),
name: e.name,
scale: 13,
address: `${e.address}-${e.detailed_address}`,
}).then(res => {})
}
// #endif
uni.openLocation({
latitude: Number(e.latitude),
longitude: Number(e.longitude),
name: e.name,
address: `${e.address}-${e.detailed_address}`,
success: function() {
Number
}
});
},
getLocation(){
var that=this
uni.getLocation({
type: 'wgs84',
success: function (res) {
console.log('当前位置的经度:' + res.longitude);
console.log('当前位置的纬度:' + res.latitude);
that.content.longitude=res.longitude
that.content.latitude=res.latitude
uni.setStorageSync('user_latitude',res.latitude)
uni.setStorageSync('user_longitude',res.longitude)
getList(that.content).then(res => {
console.log(585,uni.getStorageSync('mdnane'));
if(uni.getStorageSync('mdnane')==''){
that.storeList = res.data
that.mdlist = res.data
that.mrmd=that.mdlist[0].name
that.mdid=that.mdlist[0].id
uni.setStorageSync('mendianstore_id','')
uni.setStorageSync('mendianstore_id',that.mdid)
this.getGoodsList(this.mdid)
}
})
} }
})
},
} }
}; };

@ -15,7 +15,9 @@
<view class="mendianbox"> <view class="mendianbox">
<view class="mendianbox1"> <view class="mendianbox1">
<view class="title">{{info.name}}</view> <view class="title">{{info.name}}</view>
<view class="title1">{{info.qrcode_id}}号桌</view> <!-- <view class="title1">{{info.qrcode_id}}号桌</view> -->
<view class="title1">{{table_number}}</view>
</view> </view>
<view class="mendianbox2"> <view class="mendianbox2">
<view class="title">营业时间{{info.day_end}}-{{info.day_start}}</view> <view class="title">营业时间{{info.day_end}}-{{info.day_start}}</view>
@ -133,6 +135,7 @@
addTableCate, addTableCate,
placeOrder, placeOrder,
emptyTableData, emptyTableData,
getCodeData
} from '@/api/store.js'; } from '@/api/store.js';
import { import {
getProducts, getProducts,
@ -178,6 +181,7 @@
return { return {
getHeight: this.$util.getWXStatusHeight(), getHeight: this.$util.getWXStatusHeight(),
switchNum: 1, switchNum: 1,
table_number:'',
sysHeight: sysHeight, sysHeight: sysHeight,
categoryList: [], categoryList: [],
navActive: 0, navActive: 0,
@ -240,6 +244,7 @@
this.getCartNum(); this.getCartNum();
this.getCartList(1); this.getCartList(1);
this.mendiangetStoreData(value.store_id) this.mendiangetStoreData(value.store_id)
this.gettableinfo(value.tableId)
}, },
deep: true deep: true
} }
@ -255,7 +260,13 @@
console.log(123,uni.getStorageSync('pay_vip_status')); console.log(123,uni.getStorageSync('pay_vip_status'));
}, },
methods: { methods: {
gettableinfo(){
getCodeData({
tableId:this.info.tableId
}).then(res => {
this.table_number = res.data.table_number
});
},
boda(){ boda(){
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: this.info.phone // phoneNumber: this.info.phone //
@ -352,6 +363,7 @@
loadend = list.length < that.limit; loadend = list.length < that.limit;
that.tempArr = that.$util.SplitArray(list, that.tempArr); that.tempArr = that.$util.SplitArray(list, that.tempArr);
that.$set(that, 'tempArr', that.tempArr); that.$set(that, 'tempArr', that.tempArr);
console.log("属性",that.tempArr);
that.loading = false; that.loading = false;
that.loadend = loadend; that.loadend = loadend;
that.loadTitle = loadend ? "没有更多内容啦~" : "加载更多"; that.loadTitle = loadend ? "没有更多内容啦~" : "加载更多";

@ -85,20 +85,24 @@
store_id, store_id,
qrcode_id qrcode_id
}; };
}, },
onShow() { onShow() {
this.info.tableId = 0; this.info.tableId = 0;
if (this.isLogin) { if (this.isLogin) {
this.getTableData(); this.getTableData();
this.getUserInfo() this.getUserInfo()
} else { } else {
toLogin() toLogin()
} }
}, },
onHide() { onHide() {
this.pageVisible = false; this.pageVisible = false;
}, },
methods: { methods: {
getUserInfo(){ getUserInfo(){
getUserInfo().then(res => { getUserInfo().then(res => {
console.log(121,res) console.log(121,res)
@ -302,7 +306,9 @@
right: 0 !important; right: 0 !important;
top: 10px !important; top: 10px !important;
} }
.integer{
font-size: 18px !important;
}
/deep/.mask { /deep/.mask {
z-index: 102; z-index: 102;
} }

@ -19,7 +19,7 @@
<view class="section_1 flex-col"> <view class="section_1 flex-col">
<view class="list_1 flex-col"> <view class="list_1 flex-col">
<view class="list-items_1 flex-row" style="background:rgba(195,15,15,1.000000)"> <view class="list-items_1 flex-row" style="background:rgba(195,15,15,1.000000)" @click="gourl('/pages/users/lanhu/lanhu_cunjiujilu/index')">
<view class="text-group_1 flex-col justify-between"> <view class="text-group_1 flex-col justify-between">
<text class="text_2">存酒记录</text> <text class="text_2">存酒记录</text>
<text class="text_3">点击进入</text> <text class="text_3">点击进入</text>
@ -27,7 +27,7 @@
<image class="image_4" src="http://118.89.89.96/lanhu/1.png" /> <image class="image_4" src="http://118.89.89.96/lanhu/1.png" />
</view> </view>
<view class="list-items_1 flex-row" style="background:rgba(255,150,0,1.000000)"> <view class="list-items_1 flex-row" style="background:rgba(255,150,0,1.000000)" @click="gourl('/pages/users/lanhu/lanhu_cunjiujilu2/index')">
<view class="text-group_1 flex-col justify-between"> <view class="text-group_1 flex-col justify-between">
<text class="text_2">取酒记录</text> <text class="text_2">取酒记录</text>
<text class="text_3">点击进入</text> <text class="text_3">点击进入</text>
@ -51,6 +51,7 @@
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app'; } from '@/config/app';
import userInfor from '@/pages/index/components/userInfor';
export default { export default {
data() { data() {
return { return {
@ -63,7 +64,12 @@
methods: { methods: {
goarrow() { goarrow() {
uni.navigateBack() uni.navigateBack()
} },
gourl(url){
uni.navigateTo({
url:url
})
},
} }
}; };
</script> </script>

@ -28,7 +28,9 @@
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP --> <!-- #ifdef MP -->
<template v-if="configData.wechat_auth_switch"> <template v-if="configData.wechat_auth_switch">
<button hover-class="none" v-if="bindPhone" open-type="getPhoneNumber" @getphonenumber="getphonenumber" <button hover-class="none" v-if="!protocol" @click="agreement"
class="bg-color btn1">授权登录</button>
<button hover-class="none" v-else-if="bindPhone && protocol" open-type="getPhoneNumber" @getphonenumber="getphonenumber"
class="bg-color btn1">授权登录</button> class="bg-color btn1">授权登录</button>
<button hover-class="none" v-else-if="!bindPhone" @tap="getAuthLogin" <button hover-class="none" v-else-if="!bindPhone" @tap="getAuthLogin"
class="bg-color btn1">授权登录</button> class="bg-color btn1">授权登录</button>
@ -39,11 +41,11 @@
<button v-else hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo" <button v-else hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo"
class="bg-color btn1">授权登录</button> class="bg-color btn1">授权登录</button>
</template> </template>
<!-- <button v-if="configData.phone_auth_switch" hover-class="none" @click="phoneLogin" class="btn2">手机号登录</button> --> <button v-if="configData.phone_auth_switch" hover-class="none" @click="phoneLogin" class="btn2">手机号登录</button>
<!-- #endif --> <!-- #endif -->
</view> </view>
</view> </view>
<view class="protocol" v-if="!canGetPrivacySetting"> <view class="protocol" >
<checkbox-group @change='changeIsDefault' v-if="configData.store_user_agreement"> <checkbox-group @change='changeIsDefault' v-if="configData.store_user_agreement">
<checkbox :checked="protocol ? true : false" />已阅读并同意<text class="font-num" <checkbox :checked="protocol ? true : false" />已阅读并同意<text class="font-num"
@click="privacy('user')">用户协议</text> @click="privacy('user')">用户协议</text>
@ -60,8 +62,8 @@
</editUserModal> </editUserModal>
</block> </block>
<!-- #ifdef MP --> <!-- #ifdef MP -->
<privacyAgreementPopup v-if="canGetPrivacySetting" @onReject="onReject" @onAgree="onAgree"> <!-- <privacyAgreementPopup v-if="canGetPrivacySetting" @onReject="onReject" @onAgree="onAgree">
</privacyAgreementPopup> </privacyAgreementPopup> -->
<!-- #endif --> <!-- #endif -->
</view> </view>
</template> </template>
@ -171,6 +173,7 @@
} else { } else {
this.isHome = false; this.isHome = false;
} }
this.protocol = false;
}, },
onShow() { onShow() {
uni.removeStorageSync('form_type_cart'); uni.removeStorageSync('form_type_cart');
@ -256,6 +259,11 @@
console.log(err) console.log(err)
}); });
}, },
agreement(){
return this.$util.Tips({
title: '请先阅读并同意协议'
});
},
// //
getAuthLogin() { getAuthLogin() {
if (!this.protocol) { if (!this.protocol) {
@ -343,9 +351,11 @@
// #ifdef MP // #ifdef MP
// //
getphonenumber(e) { getphonenumber(e) {
console.log(123123123123123123132)
if(e.detail.errMsg == 'getPhoneNumber:fail user deny'){ if(e.detail.errMsg == 'getPhoneNumber:fail user deny'){
return false return false
} }
if (!this.protocol) { if (!this.protocol) {
return this.$util.Tips({ return this.$util.Tips({
title: '请先阅读并同意协议' title: '请先阅读并同意协议'

@ -232,11 +232,13 @@ export default {
'/pages/index/index' '/pages/index/index'
] ]
.indexOf(url) == -1) { .indexOf(url) == -1) {
console.log(123123123123)
uni.navigateTo({ uni.navigateTo({
url: url url: url
}) })
} else { } else {
uni.reLaunch({ console.log(123123)
uni.switchTab({
url: url url: url
}) })
} }

Loading…
Cancel
Save