1
This commit is contained in:
@@ -64,44 +64,23 @@
|
||||
usershopUserinfo: null,
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
async onLoad(e) {
|
||||
console.log(e)
|
||||
if ( e.type == 'list' || e.type == 'index') {
|
||||
this.shopId = e.shopId;
|
||||
this.init();
|
||||
}
|
||||
// if ( e.type == 'list' || e.type == 'index') {
|
||||
// this.shopId = e.shopId;
|
||||
// this.init();
|
||||
// }
|
||||
if (e.q) {
|
||||
this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
|
||||
this.tokenShow = false;
|
||||
// 等待登录结果返回
|
||||
if (!uni.cache.get('token')) {
|
||||
uni.login({
|
||||
provider: 'weixin',
|
||||
success: async (data) => {
|
||||
try {
|
||||
uni.getUserInfo({
|
||||
provider: 'weixin',
|
||||
success: async (infoRes) => {
|
||||
uni.cache.set('weixincode', data.code);
|
||||
let res = await this.api.userwxlogin({
|
||||
code: uni.cache.get('weixincode'), //临时登录凭证
|
||||
rawData: infoRes.rawData
|
||||
})
|
||||
if (res.code == 0) {
|
||||
uni.cache.set('token', res.data.token);
|
||||
uni.cache.set('miniAppOpenId', res.data.userInfo
|
||||
.miniAppOpenId)
|
||||
uni.cache.set('userInfo', res.data.userInfo);
|
||||
this.tokenShow = false;
|
||||
this.init();
|
||||
}
|
||||
},
|
||||
fail: (err) => {}
|
||||
});
|
||||
} catch (e) {}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this.init();
|
||||
await this.$onLaunched;
|
||||
}
|
||||
this.init();
|
||||
} else{
|
||||
this.shopId = e.shopId;
|
||||
this.init();
|
||||
}
|
||||
console.log(this.shopId)
|
||||
},
|
||||
@@ -240,14 +219,11 @@
|
||||
uni.navigateBack()
|
||||
}, 500)
|
||||
} else {
|
||||
uni.exitMiniProgram({
|
||||
success: function () {
|
||||
console.log('退出成功');
|
||||
},
|
||||
fail: function () {
|
||||
console.log('退出失败');
|
||||
}
|
||||
});
|
||||
setTimeout(res => {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
})
|
||||
}, 500)
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<view class="head">
|
||||
<view class="head_bg"></view>
|
||||
<view class="tips">
|
||||
<image class="informIcon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png" mode="widthFix"/>
|
||||
<image class="informIcon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/informIcon.png" mode="aspectFill"/>
|
||||
<text class="informText">温馨提示:请适量点餐,避免浪费</text>
|
||||
</view>
|
||||
<!-- <view class="tabBox"> -->
|
||||
@@ -93,7 +93,7 @@
|
||||
<view class="method_list" @click="groupChange(index+1)">
|
||||
<view class="method_list_top">
|
||||
<view class="method_list_top_left">
|
||||
<image class="icon" :src="item.url" mode="widthFix"/>
|
||||
<image class="icon" :src="item.url" mode="aspectFill"/>
|
||||
<text class="name"> {{ item.name }} </text>
|
||||
</view>
|
||||
<u-radio activeColor="#E8AD7B" icon-size="36" size="36" :name="index+1">
|
||||
@@ -210,8 +210,8 @@
|
||||
this.listinfo.name = JSON.parse(e.storeInfo).shopName;
|
||||
},
|
||||
onShow() {
|
||||
uni.$on('message', this.getMessage)
|
||||
if (this.listinfoid) {
|
||||
uni.$on('message', this.getMessage)
|
||||
this.orderorderInfo()
|
||||
} else {
|
||||
this.handlemessage()
|
||||
@@ -310,6 +310,7 @@
|
||||
userId: uni.cache.get('userInfo').id,
|
||||
"type": "connect",
|
||||
})
|
||||
uni.$on('message', this.getMessage)
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -590,7 +591,8 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
.informIcon{
|
||||
width: 26.7rpx;
|
||||
width: 26.79rpx;
|
||||
height: 24.06rpx;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
.informText{
|
||||
@@ -923,7 +925,8 @@
|
||||
.method_list_top_left{
|
||||
display: flex;
|
||||
.icon{
|
||||
width: 54rpx!important;
|
||||
width: 54.67rpx!important;
|
||||
height: 48rpx!important;
|
||||
margin-right: 22rpx;
|
||||
}
|
||||
.name{
|
||||
|
||||
@@ -382,7 +382,6 @@
|
||||
return `left-${this.leftIndex? this.leftIndex:0}`;
|
||||
},
|
||||
HeighT() { //手机类型的尺寸 导航栏高度
|
||||
console.log(this.$store.getters.is_BarHeight)
|
||||
return this.$store.getters.is_BarHeight.heightBar + this.$store.getters.is_BarHeight.customBar
|
||||
},
|
||||
scrollHeight() {
|
||||
@@ -407,38 +406,18 @@
|
||||
uni.$off('message')
|
||||
this.fixedtrue = true
|
||||
},
|
||||
onShow() {
|
||||
async onShow() {
|
||||
let _this = this;
|
||||
this.orderdetailFlag = true;
|
||||
uni.pageScrollTo({
|
||||
scrollTop: 0,
|
||||
duration: 0
|
||||
});
|
||||
uni.login({
|
||||
provider: 'weixin',
|
||||
success: async (data) => {
|
||||
uni.getUserInfo({
|
||||
provider: 'weixin',
|
||||
success: async (infoRes) => {
|
||||
uni.cache.set('weixincode', data.code);
|
||||
let res = await this.api.userwxlogin({
|
||||
code: uni.cache.get('weixincode'), //临时登录凭证
|
||||
rawData: infoRes.rawData
|
||||
})
|
||||
if (res.code == 0) {
|
||||
uni.cache.set('token', res.data.token);
|
||||
uni.cache.set('miniAppOpenId', res.data.userInfo
|
||||
.miniAppOpenId)
|
||||
uni.cache.set('userInfo', res.data.userInfo);
|
||||
uni.$on('message', this.getMessage)
|
||||
|
||||
_this.getLocation()
|
||||
}
|
||||
},
|
||||
fail: (err) => {}
|
||||
});
|
||||
}
|
||||
});
|
||||
if (!uni.cache.get('token')) {
|
||||
await this.$onLaunched;
|
||||
}
|
||||
uni.$on('message', this.getMessage)
|
||||
_this.getLocation()
|
||||
},
|
||||
methods: {
|
||||
navigateBacknav() {
|
||||
@@ -496,6 +475,7 @@
|
||||
});
|
||||
} catch (e) {
|
||||
this.productqueryShop();
|
||||
//TODO handle the exception
|
||||
}
|
||||
},
|
||||
|
||||
@@ -505,8 +485,10 @@
|
||||
async productqueryShop() {
|
||||
let res = await this.api.productqueryShop({
|
||||
code: uni.cache.get('tableCode'),
|
||||
lng: uni.cache.get('getLocationstorage').lng ? uni.cache.get('getLocationstorage').lng : '',
|
||||
lat: uni.cache.get('getLocationstorage').lat ? uni.cache.get('getLocationstorage').lat : '',
|
||||
lng: uni.cache.get('getLocationstorage').lng ? uni.cache.get('getLocationstorage').lng :
|
||||
'',
|
||||
lat: uni.cache.get('getLocationstorage').lat ? uni.cache.get('getLocationstorage').lat :
|
||||
'',
|
||||
})
|
||||
if (res.code == 0) {
|
||||
uni.cache.set('shopUser', res.data.storeInfo.id)
|
||||
@@ -525,9 +507,6 @@
|
||||
* 图片加载
|
||||
*/
|
||||
imageLoaded(item, index, index1) {
|
||||
console.log(index)
|
||||
console.log(index1)
|
||||
console.log(this.shopProductList.productInfo[index])
|
||||
this.shopProductList.productInfo[index].products[index1]['imgLoad'] = true;
|
||||
// e.currentTarget.src
|
||||
},
|
||||
@@ -567,7 +546,6 @@
|
||||
} else {
|
||||
|
||||
if (this.amountcartNumber > 0) {
|
||||
console.log(item)
|
||||
if (this.skuNumber < this.skuSuit && this.amountcartNumber <= this.skuSuit) {
|
||||
this.amountcartNumber = this.amountcartNumber - (this.skuSuit == 0 ? 1 : this.skuSuit);
|
||||
} else {
|
||||
@@ -712,6 +690,7 @@
|
||||
this.isSpec = true;
|
||||
// 但但单个规格弹框的处理
|
||||
this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量
|
||||
this.skuBtnText = `添加到购物车`
|
||||
} else {
|
||||
// 多规格数据处理
|
||||
this.isSpec = false;
|
||||
@@ -742,11 +721,8 @@
|
||||
isSkuidname = JSON.parse(JSON.stringify(this.skuidname));
|
||||
isSkuidname.push(this.specifications.tagSnap[0].children[o].name)
|
||||
//筛选符合条件的规格列表
|
||||
console.log(isSkuidname);
|
||||
filteredJson = this.querySpecList.filter(obj => obj.specSnap.indexOf(isSkuidname) == 0);
|
||||
console.log(filteredJson);
|
||||
for (let i = 0; i < filteredJson.length; i++) {
|
||||
console.log(filteredJson[i].isGrounding)
|
||||
if (filteredJson[i].isGrounding) {
|
||||
this.specifications.tagSnap[0].children[o].isGrounding = true
|
||||
break; // 终止循环
|
||||
@@ -761,7 +737,6 @@
|
||||
// console.log(val)
|
||||
// this.skuidname.push(val.children[0].info)
|
||||
// })
|
||||
console.log(this.specifications.tagSnap)
|
||||
this.hodgepodge(this.specifications.tagSnap[0], 2) //获取skuid /2查找价格和数量
|
||||
}
|
||||
|
||||
@@ -821,11 +796,8 @@
|
||||
isSkuidname = JSON.parse(JSON.stringify(this.skuidname));
|
||||
isSkuidname.push(this.specifications.tagSnap[index + 1].children[o].name)
|
||||
//筛选符合条件的规格列表
|
||||
console.log(isSkuidname);
|
||||
filteredJson = this.querySpecList.filter(obj => obj.specSnap.indexOf(isSkuidname) == 0);
|
||||
console.log(filteredJson);
|
||||
for (let i = 0; i < filteredJson.length; i++) {
|
||||
console.log(filteredJson[i].isGrounding)
|
||||
if (filteredJson[i].isGrounding) {
|
||||
this.specifications.tagSnap[index + 1].children[o].isGrounding = true
|
||||
break; // 终止循环
|
||||
@@ -839,7 +811,6 @@
|
||||
// res.data.forEach((v,e)=>{
|
||||
// // this.$set(this.specifications.tagSnap[e], 'children', v.value)
|
||||
// })
|
||||
console.log(this.specifications.tagSnap)
|
||||
|
||||
this.$forceUpdate();
|
||||
this.hodgepodge(item, 2)
|
||||
@@ -854,7 +825,7 @@
|
||||
*/
|
||||
async hodgepodge(item, a, c, num) { //此接口去获取商品id !!!赋值库存 数量 价格等
|
||||
try {
|
||||
console.log(this.skuidname.join(","))
|
||||
// console.log(this.skuidname.join(","))
|
||||
let res = await this.api.productqueryProductSku({
|
||||
code: uni.cache.get('tableCode'),
|
||||
shopId: uni.cache.get('shopUser'),
|
||||
@@ -1049,14 +1020,11 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
console.log(index)
|
||||
/* 查找当前滚动距离 */
|
||||
if (index >= this.lastbottom) { //
|
||||
console.log(index, this.leftIndex)
|
||||
this.leftIndex = index > this.leftIndex ? index : this.leftIndex
|
||||
// this.leftIndex = this.leftIndex
|
||||
} else {
|
||||
console.log(22918)
|
||||
this.leftIndex = (index < 0 ? 0 : index);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user