zhangshengli
/
yshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangshengli:fa87c1a6c34a3c3b825b2c478be3ac5575cc6971
Branches Tags
zhangshengli:main
..
compare: zhangshengli:c04c0f12cc1f07f0a5716558a70c6a111cbf3174
Branches Tags
zhangshengli:main

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

6 changed files with 150 additions and 263 deletions
Show Stats

7
fuintUniapp/config.js
Unescape Escape View File

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

9
fuintUniapp/jsconfig.json
Unescape Escape View File

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

3
fuintUniapp/pages/goods/detail.scss
Unescape Escape View File

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

130
fuintUniapp/pages/goods/detail.vue
Unescape Escape View File

@ -56,7 +56,7 @@
</view>
<!-- 商品SKU弹窗 -->
<SkuPopup v-if="!isLoading" v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart" />
<SkuPopup v-if="!isLoading" v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart"/>
<!-- 商品描述 -->
<view v-if="!isLoading" class="goods-content m-top20">
@ -85,35 +85,9 @@
<text>首页</text>
</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 v-if="cartTotal > 0" class="fast-badge fast-badge--fixed">{{ cartTotal > 99 ? '99+' : cartTotal }}
</view>
<view v-if="cartTotal > 0" class="fast-badge fast-badge--fixed">{{ cartTotal > 99 ? '99+' : cartTotal }}</view>
<view class="fast-icon">
<text class="iconfont icon-gouwuche"></text>
</view>
@ -143,16 +117,15 @@
</template>
<script>
import { setCartTabBadge, setCartTotalNum } from '@/utils/app'
import * as GoodsApi from '@/api/goods'
import * as CartApi from '@/api/cart'
import jyfParser from '@/components/jyf-parser/jyf-parser'
import Shortcut from '@/components/shortcut'
import SlideImage from './components/SlideImage'
import SkuPopup from './components/SkuPopup'
import * as settingApi from '@/api/setting'
export default {
import { setCartTabBadge, setCartTotalNum } from '@/utils/app'
import * as GoodsApi from '@/api/goods'
import * as CartApi from '@/api/cart'
import jyfParser from '@/components/jyf-parser/jyf-parser'
import Shortcut from '@/components/shortcut'
import SlideImage from './components/SlideImage'
import SkuPopup from './components/SkuPopup'
export default {
components: {
jyfParser,
Shortcut,
@ -172,10 +145,7 @@ export default {
// 显示/隐藏SKU弹窗
showSkuPopup: false,
// 模式 1:都显示 2:只显示购物车 3:只显示立即购买
skuMode: 1,
modalShow: false,//店主电话弹框
storeList: {},//店铺信息
skuMode: 1
}
},
@ -187,9 +157,6 @@ export default {
this.goodsId = parseInt(options.goodsId)
// 加载页面数据
this.onRefreshPage()
// 获取店主电话
this.getStoreList()
},
methods: {
@ -210,7 +177,7 @@ export default {
.then(result => {
const goodsData = result.data;
if (goodsData.skuList) {
goodsData.skuList.forEach(function (sku, index) {
goodsData.skuList.forEach(function(sku, index) {
goodsData.skuList[index].specIds = sku.specIds.split('-');
goodsData.skuList[index].skuId = sku.id;
})
@ -261,18 +228,7 @@ export default {
// 跳转到购物车页
onTargetCart() {
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');
},
}
},
/**
@ -308,64 +264,14 @@ export default {
path: `/pages/goods/detail?${params}`
}
}
}
}
</script>
<style>
page {
page {
background: #fafafa;
}
}
</style>
<style lang="scss" scoped>
@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;
}
}
}
}
@import "./detail.scss";
</style>

10
fuintUniapp/pages/index/index.vue
Unescape Escape View File

@ -13,17 +13,9 @@
<block>
<Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
</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"/>
</block> -->
</block>
<block>
<Blank v-if="storeInfo" :itemStyle="options.blankStyle"/>
</block>

2
fuintUniapp/pages/location/index.vue
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save