Merge remote-tracking branch 'origin/dev_store' into dev-plus-max

This commit is contained in:
yangtao 2024-03-25 10:51:08 +08:00
commit abba3e842a
2 changed files with 41 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{ {
"name" : "铸源商城", "name" : "多商户商城",
"appid" : "__UNI__2D931EE", "appid" : "__UNI__99FC347",
"description" : "", "description" : "",
"versionName" : "1.0.4", "versionName" : "1.0.4",
"versionCode" : 127, "versionCode" : 127,

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="shop_details"> <view class="shop_details" :style="viewColor">
<view class="head"> <view class="head">
<swipers :imgUrls="shopInfo.swiper_image"></swipers> <swipers :imgUrls="shopInfo.swiper_image"></swipers>
<view class="back" @tap="toRouter"><i class="iconfont icon-xiangzuo"></i></view> <view class="back" @tap="toRouter"><i class="iconfont icon-xiangzuo"></i></view>
@ -12,10 +12,17 @@
<view class="title_right"> <view class="title_right">
<view class="txt">特色餐厅(朝阳总店)</view> <view class="txt">特色餐厅(朝阳总店)</view>
<view class="grade"> <view class="grade">
<text class="iconfont icon-shitixing"></text>
<text>评分4.5</text> <text>评分4.5</text>
</view> </view>
<view class="desc">位置好找菜味道不错价格实惠</view> <view class="desc">位置好找菜味道不错价格实惠</view>
<view class="site" @tap="openMap">北京市东城区朝阳门内大街···</view> <view class="site" @tap="openMap">
<view>
<text class="iconfont icon-dingwei"></text>
<text>北京市东城区朝阳门内大街特色</text>
</view>
<view class="iconfont icon-jiantou"></view>
</view>
</view> </view>
</view> </view>
<view class="business"> <view class="business">
@ -24,6 +31,7 @@
<text>周一到周日</text> <text>周一到周日</text>
<text>0900 - 2200</text> <text>0900 - 2200</text>
</view> </view>
<view>可提供:</view>
<view class="business_list"> <view class="business_list">
<text>WiFi</text> <text>WiFi</text>
<text>充电宝</text> <text>充电宝</text>
@ -59,6 +67,7 @@
<script> <script>
import swipers from '@/components/swipers'; import swipers from '@/components/swipers';
import parser from "@/components/jyf-parser/jyf-parser"; import parser from "@/components/jyf-parser/jyf-parser";
import { mapGetters } from "vuex";
export default { export default {
components:{swipers,"jyf-parser": parser}, components:{swipers,"jyf-parser": parser},
data(){ data(){
@ -70,6 +79,9 @@
actIndex:0 actIndex:0
} }
}, },
computed:{
...mapGetters(['viewColor'])
},
methods:{ methods:{
handleTab(i){ handleTab(i){
this.actIndex = i this.actIndex = i
@ -142,6 +154,7 @@
} }
.title_right{ .title_right{
margin-left: 10rpx; margin-left: 10rpx;
width:100%;
.txt{ .txt{
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
@ -152,12 +165,31 @@
} }
.grade{ .grade{
color: #FE8C16; color: #FE8C16;
&>:first-child{
margin-right: 8rpx;
}
} }
.desc{ .desc{
color: #4E4E4E; color: #4E4E4E;
} }
.site{ .site{
color: #999999; color: #999999;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 24rpx;
.iconfont{
font-size: 24rpx;
}
&>:first-child{
max-width: 320rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
&>:first-child{
margin-right: 8rpx;
}
}
} }
} }
} }
@ -180,8 +212,10 @@
margin-top: 12rpx; margin-top: 12rpx;
text{ text{
font-size: 24rpx; font-size: 24rpx;
color: #1372F5; // color: var(--view-theme);
border: #1372F5 1px solid; // border: #1372F5 1px solid;
color: var(--view-theme);
border: var(--view-theme) 1px solid;
border-radius: 8rpx; border-radius: 8rpx;
padding: 0 16rpx; padding: 0 16rpx;
&:not(:first-child){ &:not(:first-child){
@ -219,7 +253,7 @@
bottom: 30rpx; bottom: 30rpx;
width: 80%; width: 80%;
height: 92rpx; height: 92rpx;
background: #1372F5; background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
border-radius: 60rpx; border-radius: 60rpx;
text-align: center; text-align: center;
line-height: 92rpx; line-height: 92rpx;