Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c143efe30 |
@@ -3,15 +3,12 @@ import request from '@/common/api/request.js'
|
|||||||
const url = '/account'
|
const url = '/account'
|
||||||
//根据经纬度获取信息
|
//根据经纬度获取信息
|
||||||
export const APIgeocodelocation = (data) => {
|
export const APIgeocodelocation = (data) => {
|
||||||
return new Promise((resove, reject) => {
|
return request({
|
||||||
resove(null)
|
url: url + '/user/geo/geocode',
|
||||||
|
method: 'get',
|
||||||
|
data: data,
|
||||||
|
toast: false
|
||||||
})
|
})
|
||||||
// return request({
|
|
||||||
// url: url + '/user/geo/geocode',
|
|
||||||
// method: 'get',
|
|
||||||
// data: data,
|
|
||||||
// toast: false
|
|
||||||
// })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//登录
|
//登录
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// const debug = process.env.NODE_ENV == 'development' ? true : false;
|
// const debug = process.env.NODE_ENV == 'development' ? true : false;
|
||||||
// const debug = false; // false线上 true本地
|
// const debug = false; // false线上 true本地
|
||||||
const debug = false; // false线上 true本地
|
const debug = true; // false线上 true本地
|
||||||
let baseUrl = ''
|
let baseUrl = ''
|
||||||
let baseUrlwws = ''
|
let baseUrlwws = ''
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
{{ cart.memberPrice }}
|
{{ cart.memberPrice }}
|
||||||
</text>
|
</text>
|
||||||
</block>
|
</block>
|
||||||
|
|
||||||
<text v-else class="salePrice">{{ cart.salePrice }}</text>
|
<text v-else class="salePrice">{{ cart.salePrice }}</text>
|
||||||
</text>
|
</text>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -126,7 +126,7 @@
|
|||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 占位不用管下面代码也不要删除 -->
|
<!-- 占位 -->
|
||||||
<view class="shop_bottom" style="opacity: 0;">
|
<view class="shop_bottom" style="opacity: 0;">
|
||||||
<view class="flex-between">
|
<view class="flex-between">
|
||||||
<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
|
<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
|
||||||
@@ -190,7 +190,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
<view class="shop_bottom" style="position: absolute;bottom: 0;">
|
<view class="shop_bottom" style="position: absolute;bottom: 0;z-index:100;">
|
||||||
<view class="flex-between">
|
<view class="flex-between">
|
||||||
<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
|
<view class="price price-sku" v-if="goods.type != 'package' && goods.result">
|
||||||
<text class="i">¥</text>
|
<text class="i">¥</text>
|
||||||
@@ -210,47 +210,14 @@
|
|||||||
<text
|
<text
|
||||||
v-if="goods.result.suitNum > 1">「{{ goods.result.suitNum }}{{ goods.result.unitName }}起点」</text>
|
v-if="goods.result.suitNum > 1">「{{ goods.result.suitNum }}{{ goods.result.unitName }}起点」</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="price single-and-staticPackage "
|
|
||||||
v-else-if="goods.type=='single'||(goods.type=='package'&&goods.groupType==0)">
|
|
||||||
|
|
||||||
<text class="i">¥</text>
|
|
||||||
<view class="num">
|
|
||||||
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
|
|
||||||
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
|
|
||||||
</view>
|
|
||||||
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
|
|
||||||
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
|
|
||||||
</view>
|
|
||||||
<view class="price choosePackage "
|
|
||||||
v-else-if="goods.type=='package'&&goods.groupType==1">
|
|
||||||
|
|
||||||
<text class="i">¥</text>
|
|
||||||
<view class="num">
|
|
||||||
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
|
|
||||||
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
|
|
||||||
</view>
|
|
||||||
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
|
|
||||||
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
|
|
||||||
</view>
|
|
||||||
<view class="price sku" v-else-if="goods.type=='sku'">
|
|
||||||
|
|
||||||
<text class="i">¥</text>
|
|
||||||
<view class="num">
|
|
||||||
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="selSku"
|
|
||||||
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
|
|
||||||
</view>
|
|
||||||
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
|
|
||||||
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
|
|
||||||
</view>
|
|
||||||
<view class="price price-package " v-else>
|
<view class="price price-package " v-else>
|
||||||
|
|
||||||
<text class="i">¥</text>
|
<text class="i">¥</text>
|
||||||
<view class="num">
|
<view class="num">
|
||||||
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="selSku"
|
<GoodsPrice :limitDiscount="cartStore.limitTimeDiscount" :cart="goods"
|
||||||
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
|
:shopUserInfo="shopUserInfo" :shopInfo="shopInfo"></GoodsPrice>
|
||||||
</view>
|
</view>
|
||||||
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
|
<text class="i" v-if="goods.unitName">/{{ goods.unitName }}</text>
|
||||||
<text v-if="selSku&&selSku.suitNum > 1">「{{ selSku.suitNum }}{{ selSku.unitName }}起点」</text>
|
<text v-if="goods.suitNum > 1">「{{ goods.suitNum }}{{ goods.unitName }}起点」</text>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="goods.type == 'package'&&goods.groupType==1">
|
<view v-if="goods.type == 'package'&&goods.groupType==1">
|
||||||
|
|
||||||
@@ -479,12 +446,7 @@
|
|||||||
const swiperCurrent = ref(0);
|
const swiperCurrent = ref(0);
|
||||||
|
|
||||||
function returnFirstSku(product) {
|
function returnFirstSku(product) {
|
||||||
console.log('returnFirstSku', product.skuList[0]);
|
return product.skuList[0]
|
||||||
return {
|
|
||||||
...product.skuList[0],
|
|
||||||
sku_id: product.skuList[0].id,
|
|
||||||
id: product.id,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//返回是否是多规格商品
|
//返回是否是多规格商品
|
||||||
function returnIsSkuGoods(item) {
|
function returnIsSkuGoods(item) {
|
||||||
|
|||||||
@@ -161,8 +161,9 @@
|
|||||||
@tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"></view> -->
|
@tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"></view> -->
|
||||||
</view>
|
</view>
|
||||||
<!-- <text class="num">{{ ifcartNumber(item) }}</text> -->
|
<!-- <text class="num">{{ ifcartNumber(item) }}</text> -->
|
||||||
|
|
||||||
<text class="dot num"
|
<text class="dot num"
|
||||||
v-if="returnGoodsImCartNum(item)">{{ returnGoodsImCartNum(item) < 99 ? returnGoodsImCartNum(item) : '99+' }}</text>
|
v-if="returnGoodsImCartNum(item1)">{{ returnGoodsImCartNum(item1) < 99 ? returnGoodsImCartNum(item1) : '99+' }}</text>
|
||||||
<view class="btn">
|
<view class="btn">
|
||||||
<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
|
<up-icon name="plus-circle-fill" color="#E9AB7A" size="25"></up-icon>
|
||||||
<!-- <view class="btnClick"
|
<!-- <view class="btnClick"
|
||||||
@@ -878,7 +879,7 @@
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
if (GoodsIDInCartNumMap.value.hasOwnProperty(goods.id)) {
|
if (GoodsIDInCartNumMap.value.hasOwnProperty(goods.id)) {
|
||||||
return GoodsIDInCartNumMap.value[goods.id]
|
GoodsIDInCartNumMap.value[goods.id]
|
||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ const myFunList = ref([
|
|||||||
// icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_member.png"
|
// icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_member.png"
|
||||||
// },
|
// },
|
||||||
// { name: "关于", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/inRegard.png"},
|
// { name: "关于", type: "", icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/inRegard.png"},
|
||||||
// { name: '联系商家', type: 'contact', icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/2b0480c32c1844dbae2c09f6a729c6e8.png' }
|
{ name: '联系商家', type: 'contact', icon: 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/2b0480c32c1844dbae2c09f6a729c6e8.png' }
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const userInfo = reactive({});
|
const userInfo = reactive({});
|
||||||
|
|||||||
Reference in New Issue
Block a user