1
This commit is contained in:
parent
b3bdfe373a
commit
9958c5db29
@ -43,16 +43,18 @@
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
mer_id: ''
|
||||
mer_id: '',
|
||||
type_id: '',
|
||||
street_id: '',
|
||||
town_name: ''
|
||||
}
|
||||
},
|
||||
|
||||
onLoad(opt) {
|
||||
// this.mer_id = opt.id || 244;
|
||||
// this.getData();
|
||||
|
||||
this.type_id = opt.type_id;
|
||||
this.street_id = opt.street_id;
|
||||
this.town_name = opt.town_name;
|
||||
this.getCloundShop();
|
||||
|
||||
},
|
||||
|
||||
methods: {
|
||||
@ -81,7 +83,7 @@
|
||||
goSmallType(e) {
|
||||
uni.setStorageSync("market_type_parent", e);
|
||||
uni.navigateTo({
|
||||
url: "/pages/cloud_warehouse/small_classification/index"
|
||||
url: `/pages/cloud_warehouse/small_classification/index?type_id=${this.type_id}&townName=${this.town_name}&street_id=${this.street_id}`
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -231,23 +231,19 @@
|
||||
title: '默认',
|
||||
key: 0,
|
||||
order: ""
|
||||
},
|
||||
{
|
||||
}, {
|
||||
title: '销量',
|
||||
key: 1,
|
||||
order: 'sales'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
title: '好评',
|
||||
key: 2,
|
||||
order: 'rate'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
title: '距离',
|
||||
key: 3,
|
||||
order: 'location'
|
||||
}
|
||||
],
|
||||
}],
|
||||
// 商铺列表
|
||||
storeList: [],
|
||||
storeParam: {
|
||||
|
@ -10,14 +10,13 @@
|
||||
<view class="town_name">{{ street||'定位中' }}</view>
|
||||
</view>
|
||||
<view style="display: flex;">
|
||||
<view class="iconfont icon-saoma" @click="scanQRcode" style="color:#fff;margin-right: 20rpx;"> </view>
|
||||
<view class="iconfont icon-saoma" @click="scanQRcode" style="color:#fff;margin-right: 20rpx;">
|
||||
</view>
|
||||
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
|
||||
</navigator>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<view class="" v-if="!isFshow">
|
||||
@ -28,7 +27,8 @@
|
||||
<view class="town_name">{{ street||'定位中' }}</view>
|
||||
</view>
|
||||
<view style="display: flex;">
|
||||
<view class="iconfont icon-saoma" @click="scanQRcode" style="color:#fff;margin-right: 20rpx;"> </view>
|
||||
<view class="iconfont icon-saoma" @click="scanQRcode"
|
||||
style="color:#fff;margin-right: 20rpx;"> </view>
|
||||
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||
<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
|
||||
</navigator>
|
||||
@ -58,9 +58,9 @@
|
||||
<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
|
||||
@change="dchange">
|
||||
</zbpSwiper>
|
||||
|
||||
<view class="home_list" style="padding-bottom: 0;">
|
||||
<image class="left" @click="navgo('/pages/cloud_warehouse/big_classification/index')"
|
||||
<image class="left"
|
||||
@click="navgo(`/pages/cloud_warehouse/big_classification/index?type_id=10,17,21&street_id=${street_id}&town_name=${town}`)"
|
||||
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp">
|
||||
</image>
|
||||
<view class="right">
|
||||
@ -385,11 +385,11 @@
|
||||
},
|
||||
// #endif
|
||||
methods: {
|
||||
scanQRcode(){
|
||||
scanQRcode() {
|
||||
uni.scanCode({
|
||||
success: (res) => {
|
||||
console.log(res);
|
||||
if(res.result && res.result.includes('pages/payment/get_payment')){
|
||||
if (res.result && res.result.includes('pages/payment/get_payment')) {
|
||||
let url = res.result.replace(/.*lihaink.cn/g, '');
|
||||
uni.navigateTo({
|
||||
url: url,
|
||||
@ -397,8 +397,7 @@
|
||||
Toast('跳转页面失败')
|
||||
}
|
||||
})
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
Toast('无效的二维码')
|
||||
}
|
||||
}
|
||||
@ -421,7 +420,6 @@
|
||||
})
|
||||
uni.removeStorageSync('RejectTarget')
|
||||
this.selfLocation()
|
||||
|
||||
},
|
||||
shuffleArray(array) { // 洗牌算法
|
||||
for (let i = array.length - 1; i > 0; i--) {
|
||||
@ -558,7 +556,6 @@
|
||||
this.backColor = 1
|
||||
this.isFshow = true
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
getCloudShopMerId(id) {
|
||||
@ -570,7 +567,6 @@
|
||||
this.showPicker = true
|
||||
},
|
||||
confirm(e) {
|
||||
|
||||
this.street = e.value[1].name
|
||||
this.street_id = e.value[1].code
|
||||
this.town = e.value[1].name
|
||||
@ -582,7 +578,6 @@
|
||||
this.$nextTick(() => {
|
||||
this.list(true, this.street_id)
|
||||
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
|
||||
|
||||
})
|
||||
this.showPicker = false
|
||||
},
|
||||
@ -687,6 +682,7 @@
|
||||
this.isshow = true
|
||||
uni.setStorageSync('loction', true);
|
||||
}
|
||||
console.log(123123123);
|
||||
// console.log(this.$store.state.storage.location);
|
||||
if (this.$store?.state?.storage?.location?.lat) {
|
||||
this.isshow = false
|
||||
|
@ -19,10 +19,10 @@
|
||||
<!-- 付款金额 -->
|
||||
<view class="v-con">
|
||||
<view class="v-con-text">付款金额</view>
|
||||
<view class="v-con-input">
|
||||
<view class="v-con-input" style="margin-right: 10px;">
|
||||
<text style="color: #303133;font-size:46rpx;">¥</text>
|
||||
<u--input type="number" maxlength="5" fontSize="23" v-model="cartForm.total_amount" placeholder="请输入金额"
|
||||
border="none" placeholderStyle="color:#999;font-size:30rpx">
|
||||
<u--input type="digit" maxlength="5" fontSize="23" v-model="cartForm.total_amount"
|
||||
placeholder="请输入金额" border="none" placeholderStyle="color:#999;font-size:30rpx">
|
||||
</u--input>
|
||||
</view>
|
||||
|
||||
@ -41,8 +41,10 @@
|
||||
<view class="v-btn-wrap">
|
||||
<view class="v-btn" @click="submitOrder">提交订单</view>
|
||||
</view>
|
||||
|
||||
<!-- 登陆 -->
|
||||
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
|
||||
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
|
||||
</authorize>
|
||||
</view>
|
||||
|
||||
<!-- 无商户信息提示 -->
|
||||
@ -50,7 +52,8 @@
|
||||
<image src="/static/images/no_thing.png"></image>
|
||||
<text>暂未登陆~</text>
|
||||
<!-- 登陆 -->
|
||||
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
|
||||
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
|
||||
</authorize>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@ -326,7 +329,9 @@
|
||||
|
||||
.num {
|
||||
font-size: 46rpx;
|
||||
|
||||
display: inline-block;
|
||||
overflow: auto;
|
||||
width: 160rpx;
|
||||
}
|
||||
}
|
||||
|
||||
@ -361,7 +366,7 @@
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: 240rpx;
|
||||
background-color: #FCDFAD;
|
||||
background-color: #FDD6A6;
|
||||
|
||||
.v-btn {
|
||||
width: 650rpx;
|
||||
|
Loading…
x
Reference in New Issue
Block a user