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

1

Browse Source
main
liudan 8 months ago
parent 4a600a95c3
commit 54d45a6a51
13 changed files with 46 additions and 35 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
      pages.json
  2. 4
      pages/activity/combination_details/index.vue
  3. 4
      pages/activity/goods_seckill_details/index.vue
  4. 4
      pages/activity/lifeService/index.vue
  5. 4
      pages/activity/presell_details/index.vue
  6. 4
      pages/admin/goods_details/index.vue
  7. 4
      pages/order_details/index.vue
  8. 17
      pages/shop/shop.vue
  9. 17
      pages/shop/shop1.vue
  10. 2
      pages/store/detail/index.vue
  11. 12
      pages/store/shopStreet/index.vue
  12. 4
      pages/user/index.vue
  13. 3
      pages/users/user_address_list/index.vue

2
pages.json
Unescape View File

@ -303,7 +303,7 @@
{
"path": "user_spread_code/index",
"style": {
"navigationBarTitleText": "分销海报"
"navigationBarTitleText": "分享海报"
}
},
{

4
pages/activity/combination_details/index.vue
Unescape View File

@ -194,9 +194,9 @@
<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red ml8">自营</text>
</view>
<view class="txt">
<!-- <view class="txt">
{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
</view>
<navigator :url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link" hover-class="none">进店</navigator>
</view>

4
pages/activity/goods_seckill_details/index.vue
Unescape View File

@ -117,9 +117,9 @@
<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red ml8">自营</text>
</view>
<view class="txt">
<!-- <view class="txt">
{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
</view>
<navigator v-if="hide_mer_status == 0" :url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link"
hover-class="none">进店</navigator>

4
pages/activity/lifeService/index.vue
Unescape View File

@ -43,9 +43,9 @@
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
</view>
<view class="mer-btn">
<view class="">
<!-- <view class="">
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
<view class="line" v-if="item.distance"></view>
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
<view class="">

4
pages/activity/presell_details/index.vue
Unescape View File

@ -169,9 +169,9 @@
<text v-if="(storeInfo.merchant && storeInfo.merchant.type_name)" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
<text v-else-if="(storeInfo.merchant && storeInfo.merchant.is_trader)" class="font-bg-red ml8">自营</text>
</view>
<view class="txt">
<!-- <view class="txt">
{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
</view>
<navigator :url="'/pages/store/home/index?id='+storeInfo.merchant.mer_id" class="link" hover-class="none">进店</navigator>
</view>

4
pages/admin/goods_details/index.vue
Unescape View File

@ -223,10 +223,10 @@
<text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8">{{storeInfo.merchant.type_name}}</text>
<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8">自营</text>
</view>
<view v-if="storeInfo.merchant.care_count" class="txt">
<!-- <view v-if="storeInfo.merchant.care_count" class="txt">
{{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
</view>
<view v-else class="txt">0人关注</view>
<view v-else class="txt">0人关注</view> -->
</view>
</view>
<view class="score-wrapper">

4
pages/order_details/index.vue
Unescape View File

@ -90,7 +90,7 @@
</view>
<view class="line2">{{orderInfo.take.mer_take_address}}</view>
</view>
<!-- <view v-if="orderInfo.take" class="take-info">
<view v-if="orderInfo.take" class="take-info">
<view class="take-msg">
<view class="left">
<view class="title">
@ -111,7 +111,7 @@
</view>
</view>
</view>
</view> -->
</view>
<view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1" @click="goStore(orderInfo.mer_id)">
{{orderInfo.merchant.mer_name}}
<text class="iconfont icon-xiangyou"></text>

17
pages/shop/shop.vue
Unescape View File

@ -275,7 +275,7 @@
this.latitude = res.latitude
this.longitude = res.longitude
console.log(res)
this.storeMerchantList('')
this.searchSubmit()
getGeocoder({
lat: latitude,
long: longitude
@ -347,10 +347,10 @@
});
},
searchSubmit(){
console.log("uuuuu",this.where.keyword)
this.sotreParam.page = 1;
this.storeList=[]
this.storeMerchantList('')
this.storeMerchantList()
},
// 查找店铺
@ -373,7 +373,12 @@
item.allScore = tempNum.toFixed(2)
})
this.storeScroll = res.data.list.length >= this.sotreParam.limit
this.storeList = this.storeList.concat(res.data.list)
if(type){
this.storeList = this.storeList.concat(res.data.list)
}else{
this.storeList = res.data.list
}
this.count = res.data.count
this.loading = false
})
@ -386,7 +391,7 @@
this.sotreParam.page = 1
this.storeScroll = true
this.storeList = []
this.storeMerchantList()
this.searchSubmit()
},
onLoadFun: function(e) {
@ -427,7 +432,7 @@
});
} else {
this.sotreParam.page += 1
this.storeMerchantList()
this.storeMerchantList(true)
}
}
},

17
pages/shop/shop1.vue
Unescape View File

@ -275,7 +275,7 @@
this.latitude = res.latitude
this.longitude = res.longitude
console.log(res)
this.storeMerchantList('')
this.searchSubmit()
getGeocoder({
lat: latitude,
long: longitude
@ -347,10 +347,10 @@
});
},
searchSubmit(){
console.log("uuuuu",this.where.keyword)
this.sotreParam.page = 1;
this.storeList=[]
this.storeMerchantList('')
this.storeMerchantList()
},
// 查找店铺
@ -373,7 +373,12 @@
item.allScore = tempNum.toFixed(2)
})
this.storeScroll = res.data.list.length >= this.sotreParam.limit
this.storeList = this.storeList.concat(res.data.list)
if(type){
this.storeList = this.storeList.concat(res.data.list)
}else{
this.storeList = res.data.list
}
this.count = res.data.count
this.loading = false
})
@ -386,7 +391,7 @@
this.sotreParam.page = 1
this.storeScroll = true
this.storeList = []
this.storeMerchantList()
this.searchSubmit()
},
onLoadFun: function(e) {
@ -427,7 +432,7 @@
});
} else {
this.sotreParam.page += 1
this.storeMerchantList()
this.storeMerchantList(true)
}
}
},

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

@ -24,7 +24,7 @@
<text v-else-if="store.is_trader" class="font-bg-red ml8">自营</text>
</view>
<!-- <view class="fans">{{ store.care_count < 10000 ? store.care_count : (store.care_count / 10000).toFixed(2) + '万' }}人关注</view> -->
<view class="fans">{{ store.care_count}}人关注</view>
<!-- <view class="fans">{{ store.care_count}}人关注</view> -->
</view>
<view class="section wrap" style="margin-top: 22rpx;padding:0;background: none;">

12
pages/store/shopStreet/index.vue
Unescape View File

@ -54,9 +54,9 @@
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
</view>
<view class="mer-btn">
<view class="">
<!-- <view class="">
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
<view class="line" v-if="item.distance"></view>
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
<view class="">
@ -93,9 +93,9 @@
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
</view>
<view class="mer-btn">
<view class="">
<!-- <view class="">
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
<view class="line" v-if="item.distance"></view>
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
<view class="">
@ -132,9 +132,9 @@
<text v-else-if="item.is_trader" class="font-bg-red ml8">自营</text>
</view>
<view class="mer-btn">
<view class="">
<!-- <view class="">
{{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
</view>
</view> -->
<view class="line" v-if="item.distance"></view>
<view class="distance" v-if="item.distance" @click.stop="showStoreLocation(item)">
<view class="">

4
pages/user/index.vue
Unescape View File

@ -150,7 +150,7 @@
</view>
</view>
<!-- 轮播 -->
<!-- <view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
<block v-for="(item,index) in imgUrls" :key="index">
@ -161,7 +161,7 @@
</swiper-item>
</block>
</swiper>
</view> -->
</view>
<!-- 会员菜单 -->
<view class="user-menus" style="margin-top: 20rpx;">
<view class="title skeleton-rect">我的服务</view>

3
pages/users/user_address_list/index.vue
Unescape View File

@ -483,7 +483,8 @@
.noCommodity{
text-align: center;
border-top: none;
margin-top: 15vh;
// margin-top: 15vh;
padding-top:15vh;
}
.noCommodity .pictrue{
height: 305rpx;

Write Preview
Loading…
Cancel
Save