更新
This commit is contained in:
parent
7fe2c49d19
commit
6903408794
8
App.vue
8
App.vue
@ -77,10 +77,10 @@
|
||||
visible: false
|
||||
})
|
||||
// #ifdef H5
|
||||
uni.setTabBarItem({
|
||||
index: 2,
|
||||
visible: false
|
||||
})
|
||||
// uni.setTabBarItem({
|
||||
// index: 2,
|
||||
// visible: false
|
||||
// })
|
||||
// #endif
|
||||
|
||||
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
|
||||
|
@ -19,7 +19,8 @@ const env = 'dev'
|
||||
|
||||
// 网络接口修改此字符 小程序域名要求https
|
||||
// httpApi = 'http://192.168.31.106:8324' //测试
|
||||
httpApi = 'https://test.shop.lihaink.cn' //生产
|
||||
// httpApi = 'https://test.shop.lihaink.cn' //生产
|
||||
httpApi = 'https://crmeb-test.shop.lihaink.cn' //生产
|
||||
|
||||
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
|
||||
// httpSix = 'https://new-worker.lihaink.cn'
|
||||
|
@ -20,6 +20,7 @@
|
||||
}
|
||||
|
||||
.swiperBg {
|
||||
padding-top: 25rpx;
|
||||
z-index: 1;
|
||||
|
||||
.colorBg {
|
||||
@ -157,9 +158,9 @@
|
||||
<view class="swiperBg">
|
||||
<view class="swiper page_swiper">
|
||||
<swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
|
||||
:current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;">
|
||||
:current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
|
||||
<block v-for="(item,index) in imgUrls" :key="index">
|
||||
<swiper-item :class="{ active: index == swiperCur }">
|
||||
<swiper-item :class="{ active: index == swiperCur }" @click="changeSwiper(item.info)">
|
||||
<view class='slide-navigator acea-row row-between-wrapper'>
|
||||
<image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
|
||||
</image>
|
||||
@ -332,6 +333,23 @@
|
||||
uni.$emit('showLoading', false);
|
||||
},
|
||||
methods: {
|
||||
changeSwiper(e){
|
||||
if(e.length>0 && e[1].value){
|
||||
uni.navigateTo({
|
||||
url:e[1].value
|
||||
})
|
||||
}
|
||||
},
|
||||
swiperChange(e) {
|
||||
let {
|
||||
current,
|
||||
source
|
||||
} = e.detail;
|
||||
if (source === 'autoplay' || source === 'touch') {
|
||||
this.swiperCur = e.detail.current;
|
||||
this.bgColor = this.imgUrls[e.detail.current]['img']
|
||||
}
|
||||
},
|
||||
getNav() {
|
||||
getNavigation().then(res => {
|
||||
this.newData = res.data
|
||||
|
@ -45,7 +45,7 @@
|
||||
<text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
|
||||
<text v-else class="iconfont icon-xuanzhong1"></text>
|
||||
</view>
|
||||
<navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'"
|
||||
<navigator :url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
|
||||
class="info">
|
||||
<text class="iconfont icon-shangjiadingdan"></text>
|
||||
<view class="name">{{item.mer_name}}</view>
|
||||
@ -55,7 +55,7 @@
|
||||
<!-- <view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view> -->
|
||||
</view>
|
||||
<navigator v-for="goods in item.list" :key="goods.cart_id"
|
||||
:url='"/pages/goods_details/index?id="+goods.product.product_id' hover-class='none'
|
||||
:url='`/pages/goods_details/index?id=${goods.product.product_id}&sale_type=${tabsCurr}`' hover-class='none'
|
||||
class='picTxt acea-row'>
|
||||
<view class="checkbox" @click.stop="goodsCheck(goods,index)">
|
||||
<text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text>
|
||||
|
@ -235,9 +235,9 @@
|
||||
|
||||
if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
|
||||
// return console.log(this.checkForm);
|
||||
return uni.navigateTo({
|
||||
url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
|
||||
})
|
||||
// return uni.navigateTo({
|
||||
// url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
|
||||
// })
|
||||
orderCheck(that.checkForm).then(res1 => {
|
||||
that.loading = false;
|
||||
|
||||
|
@ -235,9 +235,9 @@
|
||||
|
||||
if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
|
||||
// return console.log(this.checkForm);
|
||||
// return uni.navigateTo({
|
||||
// url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
|
||||
// })
|
||||
return uni.navigateTo({
|
||||
url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
|
||||
})
|
||||
orderCheck(that.checkForm).then(res1 => {
|
||||
that.loading = false;
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user