This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-02 09:41:04 +08:00
parent b3bdfe373a
commit 9958c5db29
4 changed files with 121 additions and 122 deletions
pages
cloud_warehouse
big_classification
small_classification
index
payment

@ -43,16 +43,18 @@
data() { data() {
return { return {
list: [], list: [],
mer_id: '' mer_id: '',
type_id: '',
street_id: '',
town_name: ''
} }
}, },
onLoad(opt) { onLoad(opt) {
// this.mer_id = opt.id || 244; this.type_id = opt.type_id;
// this.getData(); this.street_id = opt.street_id;
this.town_name = opt.town_name;
this.getCloundShop(); this.getCloundShop();
}, },
methods: { methods: {
@ -81,7 +83,7 @@
goSmallType(e) { goSmallType(e) {
uni.setStorageSync("market_type_parent", e); uni.setStorageSync("market_type_parent", e);
uni.navigateTo({ 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}`
}) })
} }
} }

@ -228,26 +228,22 @@
price_order: 'price_asc', //(), price_asc, price_desc price_order: 'price_asc', //(), price_asc, price_desc
// //
downMenu: [{ downMenu: [{
title: '默认', title: '默认',
key: 0, key: 0,
order: "" order: ""
}, }, {
{ title: '销量',
title: '销量', key: 1,
key: 1, order: 'sales'
order: 'sales' }, {
}, title: '好评',
{ key: 2,
title: '好评', order: 'rate'
key: 2, }, {
order: 'rate' title: '距离',
}, key: 3,
{ order: 'location'
title: '距离', }],
key: 3,
order: 'location'
}
],
// //
storeList: [], storeList: [],
storeParam: { storeParam: {

@ -9,15 +9,14 @@
</view> </view>
<view class="town_name">{{ street||'定位中' }}</view> <view class="town_name">{{ street||'定位中' }}</view>
</view> </view>
<view style="display: flex;"> <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;">
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> </view>
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
</navigator> <view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#fff;"></view>
</view> </navigator>
</view>
</view> </view>
</view> </view>
<view class="" v-if="!isFshow"> <view class="" v-if="!isFshow">
@ -27,12 +26,13 @@
<view class="iconfont icon-weizhi"></view> <view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street||'定位中' }}</view> <view class="town_name">{{ street||'定位中' }}</view>
</view> </view>
<view style="display: flex;"> <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"
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none"> style="color:#fff;margin-right: 20rpx;"> </view>
<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view> <navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
</navigator> <view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
</view> </navigator>
</view>
</view> </view>
<!-- <navigator url="/pages/columnGoods/goods_search/index" hover-class="none" <!-- <navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
class="search_content flex_a_c_j_sb home_search"> class="search_content flex_a_c_j_sb home_search">
@ -56,11 +56,11 @@
</view> </view>
</view> --> </view> -->
<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr" <zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
@change="dchange"> @change="dchange">
</zbpSwiper> </zbpSwiper>
<view class="home_list" style="padding-bottom: 0;"> <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"> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp">
</image> </image>
<view class="right"> <view class="right">
@ -385,25 +385,24 @@
}, },
// #endif // #endif
methods: { methods: {
scanQRcode(){ scanQRcode() {
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
console.log(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, ''); let url = res.result.replace(/.*lihaink.cn/g, '');
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
fail: () => { fail: () => {
Toast('跳转页面失败') Toast('跳转页面失败')
} }
}) })
} } else {
else { Toast('无效的二维码')
Toast('无效的二维码') }
} }
} })
}) },
},
closeActivityCard() { closeActivityCard() {
this.$refs.activityPopup.close(); this.$refs.activityPopup.close();
}, },
@ -421,7 +420,6 @@
}) })
uni.removeStorageSync('RejectTarget') uni.removeStorageSync('RejectTarget')
this.selfLocation() this.selfLocation()
}, },
shuffleArray(array) { // shuffleArray(array) { //
for (let i = array.length - 1; i > 0; i--) { for (let i = array.length - 1; i > 0; i--) {
@ -558,7 +556,6 @@
this.backColor = 1 this.backColor = 1
this.isFshow = true this.isFshow = true
} }
}, },
getCloudShopMerId(id) { getCloudShopMerId(id) {
@ -570,7 +567,6 @@
this.showPicker = true this.showPicker = true
}, },
confirm(e) { confirm(e) {
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
@ -582,7 +578,6 @@
this.$nextTick(() => { this.$nextTick(() => {
this.list(true, this.street_id) this.list(true, this.street_id)
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
}) })
this.showPicker = false this.showPicker = false
}, },
@ -687,6 +682,7 @@
this.isshow = true this.isshow = true
uni.setStorageSync('loction', true); uni.setStorageSync('loction', true);
} }
console.log(123123123);
// console.log(this.$store.state.storage.location); // console.log(this.$store.state.storage.location);
if (this.$store?.state?.storage?.location?.lat) { if (this.$store?.state?.storage?.location?.lat) {
this.isshow = false this.isshow = false

@ -1,58 +1,61 @@
<template> <template>
<view> <view>
<view class="container" v-if="merchantInfo && !isEmpty"> <view class="container" v-if="merchantInfo && !isEmpty">
<view class="v-navbar"> <view class="v-navbar">
<u-navbar title="面对面收款" :safeAreaInsetTop="false" :fixed="false" :autoBack="true" bgColor="transparent" <u-navbar title="面对面收款" :safeAreaInsetTop="false" :fixed="false" :autoBack="true" bgColor="transparent"
leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}"> leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
</u-navbar> </u-navbar>
</view> </view>
<view class="v-desc"> <view class="v-desc">
<view> <view>
<view class="v-desc-main">付款给商家</view> <view class="v-desc-main">付款给商家</view>
<view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view> <view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view>
</view> </view>
<u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx" <u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx"
:radius="10" /> :radius="10" />
</view> </view>
<!-- 付款金额 --> <!-- 付款金额 -->
<view class="v-con"> <view class="v-con">
<view class="v-con-text">付款金额</view> <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> <text style="color: #303133;font-size:46rpx;"></text>
<u--input type="number" maxlength="5" fontSize="23" v-model="cartForm.total_amount" placeholder="请输入金额" <u--input type="digit" maxlength="5" fontSize="23" v-model="cartForm.total_amount"
border="none" placeholderStyle="color:#999;font-size:30rpx"> placeholder="请输入金额" border="none" placeholderStyle="color:#999;font-size:30rpx">
</u--input> </u--input>
</view> </view>
<view class="v-wrap" v-if="cartForm.total_amount"> <view class="v-wrap" v-if="cartForm.total_amount">
<view class="v-wrap-money"> <view class="v-wrap-money">
<text class="icon"></text> <text class="icon"></text>
<text class="num">{{cartForm.total_amount}}</text> <text class="num">{{cartForm.total_amount}}</text>
</view> </view>
<view class="v-wrap-desc"> <view class="v-wrap-desc">
<view class="v-wrap-desc-main">实物提货券</view> <view class="v-wrap-desc-main">实物提货券</view>
<view class="v-wrap-desc-sub">即买即用</view> <view class="v-wrap-desc-sub">即买即用</view>
</view> </view>
</view> </view>
</view> </view>
<view class="v-btn-wrap"> <view class="v-btn-wrap">
<view class="v-btn" @click="submitOrder">提交订单</view> <view class="v-btn" @click="submitOrder">提交订单</view>
</view> </view>
<!-- 登陆 -->
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize> <!-- 登陆 -->
</view> <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
</authorize>
<!-- 无商户信息提示 --> </view>
<view v-else class="empty">
<image src="/static/images/no_thing.png"></image> <!-- 无商户信息提示 -->
<text>暂未登陆~</text> <view v-else class="empty">
<!-- 登陆 --> <image src="/static/images/no_thing.png"></image>
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize> <text>暂未登陆~</text>
</view> <!-- 登陆 -->
</view> <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
</authorize>
</view>
</view>
</template> </template>
<script> <script>
@ -326,7 +329,9 @@
.num { .num {
font-size: 46rpx; font-size: 46rpx;
display: inline-block;
overflow: auto;
width: 160rpx;
} }
} }
@ -361,7 +366,7 @@
align-items: center; align-items: center;
width: 100%; width: 100%;
height: 240rpx; height: 240rpx;
background-color: #FCDFAD; background-color: #FDD6A6;
.v-btn { .v-btn {
width: 650rpx; width: 650rpx;