Skip to content

G
groupPurchase-miniapp
Commit c93bc1bf authored by 张娇（东信）'s avatar 张娇（东信）
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 7fb60e4c 602538a8
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 44 deletions
src/pages/storeEntry/detail.vue
View file @ c93bc1bf
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<wd-button type="error" width="80%" class="submitBTN" @tap="submitData">提交</wd-button> <wd-button type="error" width="80%" class="submitBTN" @tap="submitData">提交</wd-button>
</wd-cell-group> </wd-cell-group>
<wd-popup <wd-popup
:safe-area-inset-bottom="true" :safe-area-inset-bottom="true"
v-model="show" v-model="show"
position="bottom" position="bottom"
custom-style="height:500px;overflow:auto;" custom-style="height:500px;overflow:auto;"
...@@ -180,46 +180,50 @@ ...@@ -180,46 +180,50 @@
</view> </view>
<view class="nr"> <view class="nr">
<view class="left"> <view class="left">
<template v-for="(item, index) in shopCategoryTree" :key="index"> <scroll-view scroll-y="true" class="scroll-Y">
<view <template v-for="(item, index) in shopCategoryTree" :key="index">
class="name"
@tap="setActiveCategory(index)"
:class="{ active: categoryActiveIndex == index }"
>
{{ item.name }}
</view>
</template>
</view>
<view class="right">
<template v-for="(item, index) in shopCategoryTree" :key="index">
<view class="item" v-show="categoryActiveIndex == index">
<view <view
v-for="item1 in shopCategoryTree[index].children" class="name"
:key="item1.areaId" @tap="setActiveCategory(index)"
class="miniitem" :class="{ active: categoryActiveIndex == index }"
> >
<view class="hname"> {{ item.name }}
{{ item1.name }} </view>
</view> </template>
<view class="hnr"> </scroll-view>
<template v-for="sitem in item1.children" :key="sitem.areaId"> </view>
<wd-tag <view class="right">
class="tagstyle" <scroll-view scroll-y="true" class="scroll-Y">
:class="{ <template v-for="(item, index) in shopCategoryTree" :key="index">
active: choosedShopInfo.some( <view class="item" v-show="categoryActiveIndex == index">
(item) => item.areaId === sitem.areaId, <view
), v-for="item1 in shopCategoryTree[index].children"
}" :key="item1.areaId"
round class="miniitem"
@tap="chooseShopType(sitem.areaId, sitem.name)" >
> <view class="hname">
{{ sitem.name }} {{ item1.name }}
</wd-tag> </view>
</template> <view class="hnr">
<template v-for="sitem in item1.children" :key="sitem.areaId">
<wd-tag
class="tagstyle"
:class="{
active: choosedShopInfo.some(
(item) => item.areaId === sitem.areaId,
),
}"
round
@tap="chooseShopType(sitem.areaId, sitem.name)"
>
{{ sitem.name }}
</wd-tag>
</template>
</view>
</view> </view>
</view> </view>
</view> </template>
</template> </scroll-view>
</view> </view>
</view> </view>
</view> </view>
...@@ -725,7 +729,6 @@ async function changeLocation() { ...@@ -725,7 +729,6 @@ async function changeLocation() {
location: `${res.latitude},${res.longitude}`, location: `${res.latitude},${res.longitude}`,
}, },
success: function (res) { success: function (res) {
// console.log('逆地理编码：' + JSON.stringify(res));
console.log('进入成功回调'); console.log('进入成功回调');
console.log(res.data.status); console.log(res.data.status);
if (res.data.status === 0) { if (res.data.status === 0) {
...@@ -799,11 +802,13 @@ page { ...@@ -799,11 +802,13 @@ page {
.hcontent { .hcontent {
height: 100%; height: 100%;
display: flex;
flex-direction: column;
.flex1 { .flex1 {
padding: 10px; padding: 10px;
display: flex; display: flex;
position: fixed;
width: 100%; width: 100%;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
...@@ -813,15 +818,19 @@ page { ...@@ -813,15 +818,19 @@ page {
} }
.nr { .nr {
padding-top: 42px; padding-top: 0px;
display: flex; display: flex;
flex: 1;
overflow: hidden;
.left { .left {
background: rgb(244, 244, 244); background: rgb(244, 244, 244);
width: 28%; width: 28%;
height: 100%; height: 100%;
position: fixed; overflow-y: hidden;
.scroll-Y {
height: 100%;
}
.name { .name {
text-align: left; text-align: left;
padding-left: 20rpx; padding-left: 20rpx;
...@@ -837,10 +846,16 @@ page { ...@@ -837,10 +846,16 @@ page {
.right { .right {
background: #fff; background: #fff;
width: 72%; width: 72%;
position: fixed;
left: 28%; left: 28%;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: hidden;
padding: 0 5px 5px 5px;
box-sizing: border-box;
.scroll-Y {
height: 100%;
}
.item { .item {
height: auto; height: auto;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment