Compare commits

..

No commits in common. 'fa87c1a6c34a3c3b825b2c478be3ac5575cc6971' and 'c04c0f12cc1f07f0a5716558a70c6a111cbf3174' have entirely different histories.

@ -1,9 +1,8 @@
module.exports = { module.exports = {
// 系统名称 // 系统名称
name: '会员系统', name: "会员系统",
// 必填: 后端api地址, 斜杠/结尾 // 必填: 后端api地址, 斜杠/结尾
// apiUrl: 'http://192.168.1.103:8999/', apiUrl: "http://127.0.0.1:8080/",
apiUrl: 'http://192.168.10.31:8999/',//服务器
// 必填: 默认商户号,从后台商户列表获取 // 必填: 默认商户号,从后台商户列表获取
merchantNo: '10001', merchantNo: "10001"
} }

@ -1,9 +0,0 @@
{
"compilerOptions": {
"jsx": "preserve",
"baseUrl": ".",
"paths": {
"@/*": ["./*"]
}
}
}

@ -156,8 +156,7 @@
} }
&--home { &--home {
margin-right: 15rpx; margin-right: 30rpx;
text-align: center;
} }
&--cart { &--cart {

@ -85,35 +85,9 @@
<text>首页</text> <text>首页</text>
</view> </view>
</view> </view>
<!-- 客服 -->
<view class="fast-item fast-item--home" @click="modalShow = true">
<view class="fast-icon">
<u-icon name="phone" size="32"></u-icon>
</view>
<view class="fast-text">
<text>客服</text>
</view>
</view>
<u-modal v-model="modalShow" title="店铺信息" width="650rpx" class="store-list">
<view class="store-info">
<view class="base-info">
<view class="name">{{ storeList.name }}</view>
<view class="hours">营业时间{{ storeList.hours }}</view>
<view class="address"><text class="location-icon iconfont icon-dingwei"></text>{{ storeList.address }}
</view>
<view class="tel">联系电话{{ storeList.phone }}</view>
</view>
<view class="loc-info">
<text class="dis"><text class="distance">{{ parseFloat(storeList.distance).toFixed(1) }}</text>公里</text>
</view>
</view>
</u-modal>
<!-- 购物车--> <!-- 购物车-->
<view class="fast-item fast-item--cart" @click="onTargetCart"> <view class="fast-item fast-item--cart" @click="onTargetCart">
<view v-if="cartTotal > 0" class="fast-badge fast-badge--fixed">{{ cartTotal > 99 ? '99+' : cartTotal }} <view v-if="cartTotal > 0" class="fast-badge fast-badge--fixed">{{ cartTotal > 99 ? '99+' : cartTotal }}</view>
</view>
<view class="fast-icon"> <view class="fast-icon">
<text class="iconfont icon-gouwuche"></text> <text class="iconfont icon-gouwuche"></text>
</view> </view>
@ -150,7 +124,6 @@ import jyfParser from '@/components/jyf-parser/jyf-parser'
import Shortcut from '@/components/shortcut' import Shortcut from '@/components/shortcut'
import SlideImage from './components/SlideImage' import SlideImage from './components/SlideImage'
import SkuPopup from './components/SkuPopup' import SkuPopup from './components/SkuPopup'
import * as settingApi from '@/api/setting'
export default { export default {
components: { components: {
@ -172,10 +145,7 @@ export default {
// /SKU // /SKU
showSkuPopup: false, showSkuPopup: false,
// 1: 2: 3: // 1: 2: 3:
skuMode: 1, skuMode: 1
modalShow: false,//
storeList: {},//
} }
}, },
@ -187,9 +157,6 @@ export default {
this.goodsId = parseInt(options.goodsId) this.goodsId = parseInt(options.goodsId)
// //
this.onRefreshPage() this.onRefreshPage()
//
this.getStoreList()
}, },
methods: { methods: {
@ -261,18 +228,7 @@ export default {
// //
onTargetCart() { onTargetCart() {
this.$navTo('pages/cart/index') this.$navTo('pages/cart/index')
}, }
//
async getStoreList() {
let storeId = uni.getStorageSync("storeId");
let res = await settingApi.storeList()
let temp = res.data.data
this.storeList = (temp.filter(item => item.id === storeId))[0]
console.log(this.storeList, '123132');
},
}, },
/** /**
@ -318,54 +274,4 @@ page {
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./detail.scss"; @import "./detail.scss";
//
.store-list {
// display: flex;
.store-info {
padding: 10px 0;
overflow: hidden;
border: 2rpx solid #cccccc;
min-height: 240rpx;
line-height: 55rpx;
border-radius: 5rpx;
margin-top: 10rpx;
margin-bottom: 10rpx;
padding: 30rpx;
background: #FFFFFF;
.base-info {
float: left;
width: 70%;
.name {
font-size: 34rpx;
font-weight: bold;
margin-top: 15rpx;
margin-bottom: 12rpx;
color: #666;
}
.location-icon {
color: #f03c3c;
font-weight: bold;
}
}
.loc-info {
color: #666666;
// dispaly:flex;
line-height: 75rpx;
float: left;
overflow: hidden;
width: 30%;
text-align: right;
.distance {
font-weight: bold;
color: #f03c3c;
}
}
}
}
</style> </style>

@ -13,17 +13,9 @@
<block> <block>
<Blank v-if="storeInfo" :itemStyle="options.blankStyle"/> <Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
</block> </block>
<block> <block>
咨讯
<!-- <News v-if="storeInfo" :itemStyle="options.newsStyle" :params="options.newsParam" :dataList="news"/> -->
</block>
<!-- <block>
<NavBar v-if="storeInfo" :itemStyle="options.navStyle" :params="{}" :dataList="options.navBar"/> <NavBar v-if="storeInfo" :itemStyle="options.navStyle" :params="{}" :dataList="options.navBar"/>
</block> --> </block>
<block> <block>
<Blank v-if="storeInfo" :itemStyle="options.blankStyle"/> <Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
</block> </block>

@ -196,7 +196,7 @@
} }
.loc-info { .loc-info {
color: #666666; color: #666666;
// dispaly:flex; dispaly:flex;
line-height: 240rpx; line-height: 240rpx;
float: left; float: left;
overflow: hidden; overflow: hidden;

Loading…
Cancel
Save