Compare commits

..

4 Commits

  1. 21
      pages.json
  2. 80
      pages/tabBar/category/category.vue
  3. 10
      pages/tabBar/home/home.vue
  4. 2
      physical-merchants/classify/cart/cart.vue
  5. 11
      physical-merchants/settleAccounts/detail-popup/detail-popup.vue

@ -1080,10 +1080,9 @@
}
}]
},{
"root":"physical-merchants",
"pages":[
{
}, {
"root": "physical-merchants",
"pages": [{
"path": "classify/goodsDetail/goodsDetail",
"style": {
"navigationBarTitleText": "商品详情",
@ -1213,12 +1212,12 @@
"selectedIconPath": "static/img/tabBar/home-on.png",
"text": "首页"
},
{
"pagePath": "pages/tabBar/classify/classify",
"iconPath": "static/img/tabBar/cart.png",
"selectedIconPath": "static/img/tabBar/cart-on.png",
"text": "商品"
},
// {
// "pagePath": "pages/tabBar/classify/classify",
// "iconPath": "static/img/tabBar/cart.png",
// "selectedIconPath": "static/img/tabBar/cart-on.png",
// "text": "商品"
// },
{
"pagePath": "pages/tabBar/category/category",
"iconPath": "static/img/tabBar/category.png",
@ -1234,7 +1233,7 @@
}
]
},
"condition" : { //
"condition": { //
// "current": 0, //(list )
// "list": [
// {

@ -229,14 +229,40 @@
imgadres3: 'noorder.png',
imgadres4: 'dh.png',
marker: '', //
typeid: 0, //
typeid: 99999999, //
isSelected: 1, //
selectFirst: '', //
selectFirstName: '', //
selectFirst: '99999999', //
selectFirstName: '全部', //
selectChiler: 2, //
selectChilerdistance: 2, //
goodsFirstClassList: '', //
goodsSendotClassList: '', //
goodsFirstClassList: [{
"childIndustry": null,
"createTime": 1640252815000,
"name": "全部",
"id": 99999999,
"wechatCompanyCode": "716",
"wechatName": "全部",
"ext3": null,
"parentId": 1,
"wechatSelfEmployedCode": "719",
"ext2": null,
"status": 1,
"ext1": "650"
}], //
goodsSendotClassList: [{
"childIndustry": null,
"createTime": 1640252998000,
"name": "全部",
"id": 99999999,
"wechatCompanyCode": "716",
"wechatName": "全部",
"ext3": null,
"parentId": 13,
"wechatSelfEmployedCode": "719",
"ext2": null,
"status": 1,
"ext1": "642"
}], //
distanceList: [{
id: 1,
title: '1km'
@ -292,17 +318,19 @@
getIndustry() {
getIndustry().then(res => {
if (res.return_code == '000000') {
this.goodsFirstClassList = res.return_data;
this.typeid = res.return_data[0].id;
this.goodsSendotClassList = res.return_data[0].childIndustry;
this.selectFirst = res.return_data[0].childIndustry[0].id;
this.selectFirstName = res.return_data[0].childIndustry[0].name;
for (var i = 0; i < res.return_data.length; i++) {
this.goodsFirstClassList.push(res.return_data[i]);
}
// this.typeid = res.return_data[0].id;
// this.goodsSendotClassList = res.return_data[0].childIndustry;
// this.selectFirst = res.return_data[0].childIndustry[0].id;
// this.selectFirstName = res.return_data[0].childIndustry[0].name;
let platform = uni.getSystemInfoSync().platform;
if (platform == 'android') {
this.typeplat = 2;
this.getMapStore();
}
if (platform == 'ios') {
if (platform == 'ios' || platform == 'devtools') {
this.typeplat = 1;
this.getMapStore();
}
@ -311,11 +339,17 @@
},
//
getMapStore() {
let childId = '';
if (this.selectFirst == 99999999) {
childId = '';
} else {
childId = this.selectFirst
}
let datas = {
distance: this.distance,
name: this.searchName,
type: this.typeplat,
childId: this.selectFirst,
childId: childId,
longitude: this.longitude,
latitude: this.latitude
}
@ -482,7 +516,7 @@
type: 'wgs84',
success: (res) => {
uni.hideLoading();
console.log(res, '获取当前位置')
// console.log(res, '')
this.longitude = res.longitude;
this.latitude = res.latitude;
this.getIndustry();
@ -498,9 +532,29 @@
//
changeType(item) {
this.typeid = item.id;
if (item.id == 99999999) {
this.goodsSendotClassList = [{
"childIndustry": null,
"createTime": 1640252998000,
"name": "全部",
"id": 99999999,
"wechatCompanyCode": "716",
"wechatName": "全部",
"ext3": null,
"parentId": 13,
"wechatSelfEmployedCode": "719",
"ext2": null,
"status": 1,
"ext1": "642"
}];
this.selectFirst = '99999999';
this.selectFirstName = '全部';
}else{
this.goodsSendotClassList = item.childIndustry;
this.selectFirst = item.childIndustry[0].id;
this.selectFirstName = item.childIndustry[0].name;
}
this.getMapStore();
},
//

@ -137,6 +137,16 @@
<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
</view>
</view>
<!-- 大图 -->
<view class="width90 mart20 alijusstart" v-if="item.type == 4"
@click="goGoodsList(item.jumpUrl)">
<view class="width70 font18 fcor333">
{{item.name}}
</view>
</view>
<image class="width90 mart10" mode="widthFix" v-if="item.type == 4"
:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
</image>
<!-- 惠享生活 -->
<view class="width90 mart20 alijusstart" v-if="item.type == 5">
<view class="width70 font18 fcor333">

@ -498,7 +498,7 @@
},
goClassify(){
uni.switchTab({
uni.reLaunch({
url:'/pages/tabBar/classify/classify'
})
},

@ -157,21 +157,24 @@
{{item.discountName}}
</view>
<view class="font13 mart5 fcor666">
截止时间:{{item.useEndTime | formatDate }}
截止时间:{{item.useEndTime | formatDate }} <text class="fcorred paddleft5" v-if="item.useEndTime<(new Date()).getTime()">已过期</text>
</view>
</view>
<view class="" v-if="item.discountCondition<=totalPrice">
<!-- 截止时间:{{item.useEndTime}}-- {{(new Date()).getTime() }} -->
<view class="" v-if="(item.discountCondition<=totalPrice)&&(item.useEndTime>(new Date()).getTime())&&totalPrice!=0">
<radio class="radio-ca" :checked="yhqType == item.id" :value="item.id+''" color="#FF1A34" />
</view>
</view>
<template v-if="(item.useEndTime>(new Date()).getTime())">
<view v-if="item.discountCondition>totalPrice&&item.discountType == 1" class="paddtop10 mart10 border-t font14">
<view class="fotred fontwig6 ">不可用原因</view>
<view class="fcor666">
使用门槛为{{item.discountCondition}}还差{{ parseFloat((item.discountCondition-totalPrice).toFixed(2)) }}元才能使用
</view>
</view>
</template>
</view>
</radio-group>

Loading…
Cancel
Save