|
@@ -10,8 +10,7 @@
|
|
|
<view class="one_1_2">
|
|
|
<view class="pubu">
|
|
|
<view class="list" v-for="(item,index) in shoplist" :key="index">
|
|
|
- <image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
|
|
|
- mode=""></image>
|
|
|
+ <image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
|
|
|
<view class="name">
|
|
|
{{item.name}}
|
|
|
</view>
|
|
@@ -37,20 +36,17 @@
|
|
|
<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
|
|
|
<view class="list-scroll-view">
|
|
|
<view class="second_1">
|
|
|
- <view :class="['list',condActive==index?'activeList':'']"
|
|
|
- v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
|
|
|
+ <view :class="['list',condActive==index?'activeList':'']" v-for="(item,index) in condList" :key="index" @tap="toCond(index,item)">
|
|
|
<view class="name">
|
|
|
{{item.name}}
|
|
|
</view>
|
|
|
<view class="icon">
|
|
|
<view class="icon_1">
|
|
|
- <text :class="['iconfont',item.shangActive]"
|
|
|
- v-if="condActive==index&&shang=='1'"></text>
|
|
|
+ <text :class="['iconfont',item.shangActive]" v-if="condActive==index&&shang=='1'"></text>
|
|
|
<text :class="['iconfont',item.shang]" v-else></text>
|
|
|
</view>
|
|
|
<view class="icon_1">
|
|
|
- <text :class="['iconfont', item.xiaActive]"
|
|
|
- v-if="condActive==index&&xia=='-1'"></text>
|
|
|
+ <text :class="['iconfont', item.xiaActive]" v-if="condActive==index&&xia=='-1'"></text>
|
|
|
<text :class="['iconfont', item.xia]" v-else></text>
|
|
|
</view>
|
|
|
</view>
|
|
@@ -106,13 +102,18 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="qrcode_1">
|
|
|
- <view class="qrcode_1_1">
|
|
|
+ <uqrcode ref="uqrcode" canvas-id="qrcode" :value="uqrcodeInfo" :options="{ margin:10,backgroundColor:'#f1f1f1' }">
|
|
|
+ </uqrcode>
|
|
|
+ <view class="txt">
|
|
|
+ 店铺二维码
|
|
|
+ </view>
|
|
|
+ <!-- <view class="qrcode_1_1">
|
|
|
<uqrcode ref="uqrcode" canvas-id="qrcode" :value="uqrcodeInfo" :options="{ margin:10 }">
|
|
|
</uqrcode>
|
|
|
<view class="txt">
|
|
|
店铺二维码
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="collect">
|
|
@@ -515,73 +516,6 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // display: flex;
|
|
|
- // flex-direction: column;
|
|
|
- // width: 96vw;
|
|
|
- // height: 90vh;
|
|
|
- // padding: 2vw;
|
|
|
- // background-color: var(--fFB1Color);
|
|
|
-
|
|
|
- // .first {
|
|
|
- // margin: 0 0 2vw 0;
|
|
|
-
|
|
|
- // .image {
|
|
|
- // width: 100%;
|
|
|
- // height: 50vw;
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // .second {
|
|
|
- // position: relative;
|
|
|
- // flex-grow: 1;
|
|
|
-
|
|
|
- // .list {
|
|
|
- // margin: 0 2vw 2vw 0;
|
|
|
- // background-color: var(--fffColor);
|
|
|
- // padding: 2vw;
|
|
|
- // width: 43vw;
|
|
|
- // border-radius: 5px;
|
|
|
-
|
|
|
- // .image {
|
|
|
- // width: 100%;
|
|
|
- // height: 49vw;
|
|
|
- // margin: 0 0 1vw 0;
|
|
|
- // }
|
|
|
-
|
|
|
- // .name {
|
|
|
- // font-size: var(--font15Size);
|
|
|
- // margin: 0 0 2vw 0;
|
|
|
- // }
|
|
|
-
|
|
|
- // .other {
|
|
|
- // display: flex;
|
|
|
- // flex-direction: row;
|
|
|
- // justify-content: space-between;
|
|
|
-
|
|
|
- // .money {
|
|
|
- // color: var(--ff0Color);
|
|
|
-
|
|
|
- // text:nth-child(1) {
|
|
|
- // font-size: var(--font12Size);
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // .btn {
|
|
|
- // button {
|
|
|
- // border-radius: 25px;
|
|
|
- // color: var(--fffColor);
|
|
|
- // background-color: var(--ff0Color);
|
|
|
- // font-size: var(--font12Size);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // .list:nth-child(2n) {
|
|
|
- // margin: 0 0 2vw 0;
|
|
|
- // }
|
|
|
- // }
|
|
|
}
|
|
|
|
|
|
.one_2 {
|
|
@@ -901,6 +835,7 @@
|
|
|
|
|
|
.second {
|
|
|
margin: 2vw 0;
|
|
|
+ position: relative;
|
|
|
|
|
|
.second_1 {
|
|
|
display: flex;
|
|
@@ -921,36 +856,50 @@
|
|
|
}
|
|
|
|
|
|
.qrcode_1 {
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
- text-align: center;
|
|
|
- margin: 5vw 0;
|
|
|
|
|
|
- .qrcode_1_1 {
|
|
|
- padding: 2vw;
|
|
|
- background: red;
|
|
|
+ .uqrcode {
|
|
|
+ top: 10vw;
|
|
|
+ left: 20%;
|
|
|
|
|
|
- .uqrcode {
|
|
|
- display: flex;
|
|
|
- justify-content: center;
|
|
|
- width: 216px !important;
|
|
|
- height: 216px !important;
|
|
|
+ }
|
|
|
|
|
|
- .uqrcode-canvas {
|
|
|
- -webkit-transform-origin: center;
|
|
|
- }
|
|
|
- }
|
|
|
+ .txt {
|
|
|
+ margin: 2vw 0 0 0;
|
|
|
+ position: absolute;
|
|
|
+ text-align: center;
|
|
|
+ width: 100vw;
|
|
|
+ bottom: -22vw;
|
|
|
+ }
|
|
|
|
|
|
- // canvas {
|
|
|
- // width: 180px !important;
|
|
|
- // height: 180px !important;
|
|
|
- // }
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: center;
|
|
|
+ // text-align: center;
|
|
|
+ // margin: 5vw 0;
|
|
|
|
|
|
- .txt {
|
|
|
- margin: 2vw 0 0 0;
|
|
|
- color: var(--mainColor);
|
|
|
- }
|
|
|
- }
|
|
|
+ // .qrcode_1_1 {
|
|
|
+ // padding: 2vw;
|
|
|
+
|
|
|
+ // .uqrcode {
|
|
|
+ // display: flex;
|
|
|
+ // justify-content: center;
|
|
|
+ // width: 216px !important;
|
|
|
+ // height: 216px !important;
|
|
|
+
|
|
|
+ // .uqrcode-canvas {
|
|
|
+ // -webkit-transform-origin: center;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // canvas {
|
|
|
+ // width: 180px !important;
|
|
|
+ // height: 180px !important;
|
|
|
+ // }
|
|
|
+
|
|
|
+ // .txt {
|
|
|
+ // margin: 2vw 0 0 0;
|
|
|
+ // color: #000;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
}
|