liudan
/
huitong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
liudan 1 year ago
parent 65b658dac7
commit e4a33063ea
21 changed files with 174 additions and 47 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      components/passwordPopup/index.vue
  2. 7
      pages.json
  3. 7
      pages/huitong/huitongbao/zhenxuan.vue
  4. 3
      pages/index/component/headerSerch.vue
  5. 8
      pages/plant_grass/index.vue
  6. 4
      pages/shop/shop.vue
  7. 4
      pages/shop/shop1.vue
  8. 9
      pages/store/applicationRecord/index.vue
  9. 42
      pages/store/detail/index.vue
  10. 45
      pages/store/detail/pic.vue
  11. 56
      pages/store/home/index.vue
  12. 19
      pages/store/merchantDetails/index.vue
  13. BIN
      pages/store/static/images/successTop.png
  14. BIN
      pages/store/static/images/tongguo.png
  15. 9
      pages/user/index.vue
  16. 4
      pages/users/order_confirm/index.vue
  17. 2
      static/css/style.scss
  18. BIN
      static/images/checked.png
  19. BIN
      static/images/green.png
  20. BIN
      static/images/no_login.png
  21. BIN
      static/images/passwordPop.png

2
components/passwordPopup/index.vue
Unescape View File

@ -131,7 +131,7 @@
<style scoped lang="scss">
.password-window {
background-image: url('/static/images/passwordPop.png');
background-image: url('http://b2.njrenzhou.com/static/images/passwordPop.png');
background-repeat: no-repeat;
background-size: 100% 100%;
background-color: #fff;

7
pages.json
Unescape View File

@ -597,6 +597,13 @@
"navigationStyle": "custom"
}
},
{
"path": "detail/pic",
"style": {
"navigationBarTitleText": "店铺相册"
}
},
{
"path": "list/index",
"style": {

7
pages/huitong/huitongbao/zhenxuan.vue
Unescape View File

@ -39,7 +39,8 @@
<!-- <view class="ticket-big" v-if="!is_switch && item.issetCoupon">领券满{{item.issetCoupon.use_min_price}}减{{item.issetCoupon.coupon_price}}</view> -->
</view>
<view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
<view class="company" v-if="item.merchant && hide_mer_status==0">
<!-- && hide_mer_status==0 -->
<view class="company" v-if="item.merchant">
<text class='line1'>{{item.merchant.mer_name}}</text>
<view class="flex" v-if="item.merchant" @click.stop="goStore(item.merchant.mer_id)">
@ -428,6 +429,7 @@
.name_text{
// max-width: 420rpx;
-webkit-line-clamp: 1;
}
}
}
@ -499,6 +501,7 @@
width: 508rpx;
padding: 0 0 0 22rpx;
justify-content: space-between;
align-items: normal;
.font-bg-red{
max-width: 120rpx;
}
@ -550,7 +553,7 @@
align-items: center;
font-size: 26rpx;
font-weight: bold;
color: var(--view-priceColor);
color: #E53623;
}
.productList .list .item .text .money .num {
font-size: 28rpx;

3
pages/index/component/headerSerch.vue
Unescape View File

@ -43,8 +43,9 @@
hover-class="none" class="skeleton-rect box" :style="'border-radius:'+'80'+'rpx;text-align:'+txtStyle">
<text class="iconfont icon-xiazai5"></text>
搜索商品
<view class="searchBtn">搜索</view>
</navigator>
<view class="searchBtn">搜索</view>
</view>

8
pages/plant_grass/index.vue
Unescape View File

@ -107,7 +107,8 @@
<text>暂无内容~</text>
</view>
<view v-if="!isLogin" class="empty no_login">
<image src="/static/images/no_login.png"></image>
<image :src="basePicPath1+'/static/images/no_login.png'"></image>
<view class="title">暂未登录</view>
<text>登录后可查看关注用户的发布哦~</text>
<button class="login_btn" @click="authOpen">立即登录</button>
@ -196,6 +197,7 @@
},
data() {
return {
basePicPath1:'',
domain: HTTP_REQUEST_URL,
// #ifdef MP
menuButtonInfo: uni.getMenuButtonBoundingClientRect(),
@ -287,7 +289,9 @@
...configMap({community_reply_status: 0,community_app_switch: [],community_status: 0,navigation: {}})
},
watch: {},
onLoad: function(options) {},
onLoad: function(options) {
this.basePicPath1 = this.basePicPath
},
onShow() {
app.getConfigData();
this.getCateList();

4
pages/shop/shop.vue
Unescape View File

@ -37,13 +37,13 @@
<text>{{item.distance}}</text>
</view>
<view class="phone">
191*****3897
{{item.mer_phone}}
</view>
</view>
</view>
<view class="storeAddr">
<text class='iconfont icon-dingwei'></text>
<text>江苏省南京市鼓楼区</text>
<text>{{item.mer_address}}</text>
</view>
</view>
<!-- <view class="head">

4
pages/shop/shop1.vue
Unescape View File

@ -37,13 +37,13 @@
<text>{{item.distance}}</text>
</view>
<view class="phone">
191*****3897
{{item.mer_phone}}
</view>
</view>
</view>
<view class="storeAddr">
<text class='iconfont icon-dingwei'></text>
<text>江苏省南京市鼓楼区</text>
<text>{{item.mer_address}}</text>
</view>
</view>
<!-- <view class="head">

9
pages/store/applicationRecord/index.vue
Unescape View File

@ -128,11 +128,12 @@
.card-list {
width: 100%;
background-color: #fff;
padding: 20rpx 24rpx;
// padding: 20rpx 24rpx;
margin: 10rpx 20rpx;
border-radius: 12rpx;
.card-top {
height: 140rpx;
// height: 140rpx;
padding: 30rpx;
.title {
font-size: 28rpx;
font-weight: bold;
@ -142,6 +143,7 @@
color: #999999;
font-size: 24rpx;
padding: 5rpx 0;
margin-top: 22rpx;
}
.reason {
color: #E93323;
@ -151,7 +153,7 @@
}
.line {
height: 2rpx;
margin: 20rpx 0 20rpx 0;
// margin: 20rpx 0 20rpx 0;
background-color: #EEEEEE;
}
.card-bottom {
@ -159,6 +161,7 @@
justify-content: space-between;
align-items: center;
color: #333;
padding:30rpx;
.card-status {
display: flex;
align-items: center;

42
pages/store/detail/index.vue
Unescape View File

@ -41,6 +41,21 @@
</view>
</view>
<view class="store-detail">
<view class="section" v-if="shopPics.length>0">
<view class="wrap" @click="goPic">
<view class="name">店铺相册</view>
<view class="morePic">
<text>更多图片</text>
<u-icon name="arrow-right" color="#999999" size="16"></u-icon>
</view>
</view>
<view class="picList">
<image :src="shopPics[0]" mode="aspectFill"></image>
</view>
</view>
<view class="section wrap" @click="popupShow = true">
@ -125,6 +140,7 @@ export default {
},
data() {
return {
shopPics:[],
statusBarHeight: statusBarHeight,
statusBarHeightNum:statusBarHeightNum,
domain: HTTP_REQUEST_URL,
@ -156,6 +172,11 @@ export default {
onReady: function() {},
mounted: function() {},
methods: {
goPic(){
uni.navigateTo({
url:"/pages/store/detail/pic?pic="+this.shopPics
})
},
rightClick() {
uni.navigateBack({delta:-1})
},
@ -170,6 +191,11 @@ export default {
this.store = store;
this.score = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(store.service_score)) / 3;
this.star = (this.score / 5) * 100;
let mer_pics = res.data.mer_pics
if(mer_pics){
this.shopPics = mer_pics.split(",")
}
});
},
follow: function() {
@ -395,6 +421,22 @@ export default {
border-radius: 10rpx;
margin-bottom: 20rpx;
background-color: #ffffff;
.picList{
padding: 0 32rpx 0 20rpx;
image{
height:200rpx;
width: 100%;
border-radius: 10px;
}
}
.morePic{
font-size: 24rpx;
color: #999999;
display: flex;
align-items: center;
}
}
.head {
display: flex;

45
pages/store/detail/pic.vue
Unescape View File

@ -0,0 +1,45 @@
<template>
<view class="pic">
<view class="piccontent">
<image :src="item" mode="aspectFill" @click="getPic(item,index)" v-for="(item,index) in pic" :key="index"></image>
</view>
</view>
</template>
<script>
export default{
data(){
return{
pic:[]
}
},
onLoad(option) {
console.log(option,"0099")
this.pic = option.pic.split(',')
},
methods:{
getPic(item,index){
uni.previewImage({
current: index,
urls: this.pic
});
}
}
}
</script>
<style scoped lang="scss">
.piccontent{
display: flex;
flex-wrap: wrap;
image{
flex:1;
height:200rpx;
border-radius: 10px;
margin: 10rpx;
}
}
</style>

56
pages/store/home/index.vue
Unescape View File

@ -1,6 +1,8 @@
<template>
<view :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
<!-- :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }" -->
<view
class="store-home">
<image src="/static/images/green.png" mode="widthFix" class="homePic"></image>
<!-- 搜索 -->
<!-- #ifdef MP || APP-PLUS -->
<view :style="{ height: statusBarHeight }"></view>
@ -21,7 +23,7 @@
<navigator :url="'/pages/store/list/index?mer_id='+id" hover-class="none" class="search"><text class="iconfont icon-xiazai5"></text>搜索商品</navigator>
</view>
<!-- #endif -->
<view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
<!-- <view v-show="navShow && tabActive === 3" class="nav" :style="viewColor">
<view class="nav-cont">
<view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
<view class="cont">
@ -51,9 +53,9 @@
<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
</view>
</view>
</view>
</view> -->
<!--diy页面的导航-->
<view v-show="navShow && tabActive == 1" class="nav" :style="viewColor">
<!-- <view v-show="navShow && tabActive == 1" class="nav" :style="viewColor">
<view class="nav-cont">
<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
<view class="cont">精选</view>
@ -68,7 +70,7 @@
<view class="cont">领券</view>
</view>
</view>
</view>
</view> -->
<scroll-view class="main" scroll-y="true" @scroll="scrollHome" catchtouchmove :style="viewColor">
<!-- 店铺信息 -->
<view id="store" class="store">
@ -86,7 +88,7 @@
<view
:style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}"></view>
</view>
<view>{{ score.number.toFixed(1) }}</view>
<view style="margin-left: 13rpx;color:#E53623;font-size:28rpx;">{{ score.number.toFixed(1) }}</view>
</view>
</view>
<!-- #ifdef H5 -->
@ -102,16 +104,16 @@
<view v-else class="kefu" @click="goService">
<text class="iconfont icon-kefu3"></text>
</view>
<button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
<!-- <button hover-class="none" :class="store.care ? 'care' : ''" v-if="!isLogin" @click="authOpen">
<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
{{ store.care ? '已关注' : '关注' }}
</button>
<button v-else hover-class="none" :class="store.care ? 'care' : ''" @click="followToggle">
<text v-show="!store.care" class="iconfont icon-guanzhu"></text>
{{ store.care ? '已关注' : '关注' }}
</button>
</button> -->
</view>
<view v-show="!navShow && tabActive === 3" class="nav">
<!-- <view v-show="!navShow && tabActive === 3" class="nav">
<view class="nav-cont">
<view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
<view class="cont">
@ -143,9 +145,9 @@
<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
</view>
</view>
</view>
</view> -->
<!--diy导航-->
<view v-show="!navShow && tabActive === 1" class="nav">
<!-- <view v-show="!navShow && tabActive === 1" class="nav">
<view class="nav-cont">
<view :class="{ active: diyActive == 0 }" class="item" @click="setDiy">
<view class="cont">精选</view>
@ -166,7 +168,7 @@
<text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
</view>
</view>
</view>
</view> -->
<view class="tab-cont" :style="viewColor">
<!-- diy组件 -->
<view v-show="diyActive == 0 && tabActive == 1">
@ -390,12 +392,12 @@
</view>
</view>
</scroll-view>
<view class="footer" :style="viewColor">
<!-- <view class="footer" :style="viewColor">
<view v-for="(item, index) in tabs" :key="index" :class="{ active: tabActive === item.value }" class="item" @click="tab(item.value)">
<view :class="['iconfont', item.icon]"></view>
<view>{{ item.name }}</view>
</view>
</view>
</view> -->
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
</view>
</template>
@ -1109,9 +1111,18 @@
</script>
<style lang="scss" scoped>
.homePic{
position: absolute;
top: 0px;
left: 0px;
z-index: -1;
height: 140.8px;
width: 100%;
}
.tab-cont{
background: #f5f5f5;
min-height: 500rpx;
margin-top: 70rpx;
}
/deep/.care {
background-image: none !important;
@ -1126,9 +1137,9 @@
left: 0;
display: flex;
flex-direction: column;
padding-bottom: 100rpx;
padding-bottom: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
padding-bottom: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
// padding-bottom: 100rpx;
// padding-bottom: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
// padding-bottom: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
background: left top/750rpx 390rpx no-repeat fixed;
overflow: hidden;
}
@ -1217,8 +1228,8 @@
align-items: center;
padding-right: 20rpx;
padding-left: 20rpx;
padding-top: 20rpx;
padding-bottom: 22rpx;
padding-top: 40rpx;
// padding-bottom: 22rpx;
image {
width: 74rpx;
height: 74rpx;
@ -1252,13 +1263,14 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-weight: bold;
// font-weight: bold;
font-size: 30rpx;
line-height: 1;
color: #FFFFFF;
margin: 0 20rpx;
}
.iconfont {
margin-left: 10rpx;
// margin-left: 10rpx;
font-size: 17rpx;
color: #FFFFFF;
}
@ -1266,7 +1278,7 @@
.score {
display: flex;
align-items: center;
margin-top: 17rpx;
margin-top: 20rpx;
font-weight: 500;
font-size: 24rpx;
line-height: 1;

19
pages/store/merchantDetails/index.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<view class="merchant-details">
<view class="top">
<image class="img" src="../static/images/successTop.png" mode=""></image>
<image class="img" src="../static/images/tongguo.png" mode="widthFix"></image>
<view class="title">
恭喜，您的申请已通过！
</view>
@ -150,8 +150,9 @@
align-items: center;
.img {
width: 340rpx;
height: 280rpx;
margin: 140rpx 0 30rpx 0;
// height: 280rpx;
height: auto;
margin: 126rpx 0 60rpx 0;
}
.title {
font-size: 32rpx;
@ -161,9 +162,9 @@
}
.msg {
width: 85%;
padding: 30rpx;
height: 150rpx;
margin: 70rpx 70rpx;
padding: 40rpx 30rpx;
// height: 150rpx;
margin: 60rpx 70rpx;
background-color: #F6F6F6;
border-radius: 8rpx;
.url {
@ -177,7 +178,7 @@
}
.head {
color: #333333;
font-size: 28rpx;
font-size: 30rpx;
font-weight: 500;
white-space: nowrap;
}
@ -186,10 +187,10 @@
font-size: 26rpx;
}
.cope {
padding: 5rpx 16rpx;
padding: 10rpx 20rpx;
color: #FFFFFF;
border-radius: 30rpx;
background-color: #999999;
background-color: #116636;
margin-left: 40rpx;
font-size: 20rpx;
}

BIN
pages/store/static/images/successTop.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
pages/store/static/images/tongguo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

9
pages/user/index.vue
Unescape View File

@ -162,12 +162,18 @@
<view class="menu-box">
<block v-for="(item,index) in personalMenu" :key="index">
<view v-if="item.isShow" class="item">
<view @click="authTo(item.url)" class="item-count">
<view @click="authTo(item.url)" v-if="item.url!='kefu'" class="item-count">
<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
<image v-else :src="item.pic"></image>
<text>{{item.name}}</text>
</view>
<button open-type="contact" v-else class="item-count">
<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
<image v-else :src="item.pic"></image>
<text>{{item.name}}</text>
</button>
</view>
</block>
</view>
</view>
@ -427,6 +433,7 @@
},
methods: {
authTo(url){
if(this.isLogin){
uni.navigateTo({
url

4
pages/users/order_confirm/index.vue
Unescape View File

@ -317,7 +317,7 @@
<block v-if="item.value == 'balance'">
{{userInfo.now_money}}
</block>
<image src="/static/images/checked.png" mode="" v-if="active==index" style="width:30rpx;height:30rpx;margin-left:25rpx;"></image>
<image :src="basePicPath1+'/static/images/checked.png'" mode="" v-if="active==index" style="width:30rpx;height:30rpx;margin-left:25rpx;"></image>
<view style="width: 30rpx;height: 30rpx;background: #FFFFFF;border-radius: 50%;border: 1px solid #CCCCCC;margin-left:25rpx;" v-else></view>
</view>
@ -627,6 +627,7 @@
order_key: '',
is_take: '',
domain: HTTP_REQUEST_URL,
basePicPath1:''
};
},
computed: {
@ -646,6 +647,7 @@
mounted: function() {
},
onLoad: function(options) {
this.basePicPath1 = this.basePicPath
this.seckillId = options.seckillId
// #ifdef H5
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'

2
static/css/style.scss
View File

File diff suppressed because one or more lines are too long

BIN
static/images/checked.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB

BIN
static/images/green.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
static/images/no_login.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
static/images/passwordPop.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

Write Preview
Loading…
Cancel
Save