|
|
@@ -13,7 +13,7 @@
|
|
|
<view class="">
|
|
|
<view class="typeNum">
|
|
|
<view class="left" style="font-size: 24rpx; color: #777;" @click="areaShowed()">
|
|
|
- <text :class="areaShow==true?'active':''" style="margin-right: 20rpx;">上架时间</text>
|
|
|
+ <text :class="areaShow==true?'active':''" style="margin-right: 20rpx;">{{areaval}}</text>
|
|
|
<u-icon name="arrow-down-fill" bold='true' v-if="areaShow==false" size="20" labelPos="left"
|
|
|
labelSize="26"></u-icon>
|
|
|
<u-icon name="arrow-up-fill" bold='true' v-else color="#007a68" labelColor='#007a68' size="20"
|
|
|
@@ -36,6 +36,8 @@
|
|
|
<view class="custom_popup">
|
|
|
<view class="types">
|
|
|
<view class="pricequjian">
|
|
|
+ <template v-if="merchantType==10">
|
|
|
+ <!-- 渔家乐 -->
|
|
|
<view class="jiage" v-for="(item, index) in list1" :key="index"
|
|
|
@click="clickareaShow(item, index)">
|
|
|
<view class="contentpeice">
|
|
|
@@ -49,6 +51,23 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <!-- 餐饮 -->
|
|
|
+ <view class="jiage" v-for="(item, index) in list" :key="index"
|
|
|
+ @click="clickareaShow(item, index)">
|
|
|
+ <view class="contentpeice">
|
|
|
+ <view class="title" :class="{'Doublactive': areaShowIndex == index}">
|
|
|
+ {{item.name}}
|
|
|
+ </view>
|
|
|
+ <view class="image" v-if="areaShowIndex == index">
|
|
|
+ <image
|
|
|
+ src="https://i.ringzle.com/file/20240316/16dd69efb40242de83da8207539ec73e.png"
|
|
|
+ mode=""></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </template>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -252,6 +271,7 @@
|
|
|
Selected: false,
|
|
|
showPricing: false,
|
|
|
areaShow: false,
|
|
|
+ areaval:'上架时间',
|
|
|
//餐饮
|
|
|
list: [{
|
|
|
name: '创建时间',
|
|
|
@@ -290,11 +310,7 @@
|
|
|
// },
|
|
|
],
|
|
|
//渔家乐
|
|
|
- list1: [{
|
|
|
- name: '创建时间',
|
|
|
- key: 'createDate',
|
|
|
- value: 1
|
|
|
- },
|
|
|
+ list1: [
|
|
|
{
|
|
|
name: '上架时间',
|
|
|
key: 'updateDate',
|
|
|
@@ -302,24 +318,25 @@
|
|
|
},
|
|
|
{
|
|
|
name: '销量从高到低',
|
|
|
- key: 'salesVolume',
|
|
|
+ key: 'soldNum',
|
|
|
value: 1
|
|
|
},
|
|
|
- {
|
|
|
- name: '价格从高到低',
|
|
|
- key: 'discountPrice',
|
|
|
- value: 1
|
|
|
- },
|
|
|
- {
|
|
|
- name: '价格从低到高',
|
|
|
- key: 'discountPrice',
|
|
|
- value: 0
|
|
|
- }
|
|
|
+ // {
|
|
|
+ // name: '价格从高到低',
|
|
|
+ // key: '',
|
|
|
+ // value: 1
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // name: '价格从低到高',
|
|
|
+ // key: '',
|
|
|
+ // value: 0
|
|
|
+ // }
|
|
|
],
|
|
|
areaShowIndex: null,
|
|
|
+ merchantType:uni.getStorageSync('merchantType'),
|
|
|
fromData: {
|
|
|
merchantId: uni.getStorageSync('merchantId'), //商户id
|
|
|
- limit: 99999,
|
|
|
+ limit: 99,
|
|
|
page: 1,
|
|
|
sortType: '', //选择条件：1创建时间 2销量从高到低 3价格从高到低 4价格从低到高
|
|
|
status: 0, //状态：0上架1下架
|
|
|
@@ -711,6 +728,7 @@
|
|
|
clickareaShow(e, i) {
|
|
|
this.areaShowIndex = i;
|
|
|
this.areaShow = false;
|
|
|
+ this.areaval=e.name;
|
|
|
// this.fromData.sortType = e.id;
|
|
|
// this.fromData.page = 1;
|
|
|
//this.getRepast();
|
|
|
@@ -856,7 +874,7 @@
|
|
|
|
|
|
.types {
|
|
|
width: 100%;
|
|
|
- padding: 20rpx 30rpx;
|
|
|
+ padding: 2rpx 30rpx;
|
|
|
box-sizing: border-box;
|
|
|
background: #FFFFFF;
|
|
|
|
|
|
@@ -868,7 +886,7 @@
|
|
|
width: 100%;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
- margin: 30rpx 0;
|
|
|
+ margin: 36rpx 0;
|
|
|
|
|
|
.title {
|
|
|
font-weight: Regular;
|
