clunt
/
dingdong-mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面完善

This commit is contained in:
donqi 2022-06-27 17:30:14 +08:00
parent 38b2438ff7
commit 3e0b1593c5
12 changed files with 141 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
common/js/data.js
View File

@ -48,13 +48,13 @@ const subCategories = [{
cuIcon: 'shopfill', cuIcon: 'shopfill',
color: 'red', color: 'red',
name: '空调清洗', name: '空调清洗',
badge: '69洗' badge: ''
}, { }, {
id: 2, id: 2,
cuIcon: 'shopfill', cuIcon: 'shopfill',
color: 'orange', color: 'orange',
name: '家庭维修', name: '家庭维修',
badge: '新品' badge: ''
}, { }, {
id: 3, id: 3,
cuIcon: 'shopfill', cuIcon: 'shopfill',
@ -111,25 +111,25 @@ const subCategories = [{
badge: '' badge: ''
}, { }, {
id: 12, id: 12,
cuIcon: 'deliver', cuIcon: 'shopfill',
color: 'green', color: 'green',
name: '手机维修', name: '手机维修',
badge: '' badge: ''
}, { }, {
id: 13, id: 13,
cuIcon: 'deliver', cuIcon: 'shopfill',
color: 'pink', color: 'pink',
name: '洗衣洗鞋', name: '洗衣洗鞋',
badge: '' badge: ''
}, { }, {
id: 14, id: 14,
cuIcon: 'deliver', cuIcon: 'shopfill',
color: 'pink', color: 'pink',
name: '上门安装', name: '上门安装',
badge: '' badge: ''
}, { }, {
id: 15, id: 15,
cuIcon: 'deliver', cuIcon: 'shopfill',
color: 'pink', color: 'pink',
name: '奢品养护', name: '奢品养护',
badge: '' badge: ''
@ -744,21 +744,21 @@ const myInfo = {
isVip: false, isVip: false,
level: 'V3' level: 'V3'
}, },
balance: '162.83', balance: 0,
integrate: 0, integrate: 0,
cartNum: 3, cartNum: 0,
servCircle: { servCircle: {
id: 1, id: 1,
name: '保利云景', name: '保利云景',
news: [{ newBuy: [{
id: 1, id: 1,
avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big33000.jpg', avatarUrl: '',
userName: 'tsda9', userName: 'tsda9',
action: '购买了家政/修理/门窗/滑轮更换服务', action: '购买了家政/修理/门窗/滑轮更换服务',
type: 0 // 0表示立即下单，1表示学家政 type: 0 // 0表示立即下单，1表示学家政
}, { }, {
id: 2, id: 2,
avatarUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big33001.jpg', avatarUrl: '',
userName: '心da8', userName: '心da8',
action: '发布了清洗/空调/挂机清洗服务 高温蒸清全拆', action: '发布了清洗/空调/挂机清洗服务 高温蒸清全拆',
type: 1 // 0表示立即下单，1表示学家政 type: 1 // 0表示立即下单，1表示学家政
@ -1605,83 +1605,83 @@ const servCategory = [{
}] }]
const categoryList = [{ const categoryList = [{
id: 1, goodsCategoryId: 1,
name: '家电清洗', goodsCategoryName: '家电清洗',
children: [{ child: [{
pId: 1, pId: 1,
id: 2, goodsCategoryId: 2,
name: '空调', goodsCategoryName: '空调',
children: [{ child: [{
id: 3, goodsCategoryId: 3,
name: '单台清洗' goodsCategoryName: '单台清洗'
}, { }, {
id: 4, goodsCategoryId: 4,
name: '套餐清洗' goodsCategoryName: '套餐清洗'
}, { }, {
id: 5, goodsCategoryId: 5,
name: '空调加氧' goodsCategoryName: '空调加氧'
}] }]
}, { }, {
pId: 1, pId: 1,
id: 6, goodsCategoryId: 6,
name: '烟灶', goodsCategoryName: '烟灶',
children: [{ child: [{
id: 7, goodsCategoryId: 7,
name: '单台清洗' goodsCategoryName: '单台清洗'
}, { }, {
id: 8, goodsCategoryId: 8,
name: '套餐清洗' goodsCategoryName: '套餐清洗'
}] }]
}] }]
}, { }, {
id: 9, goodsCategoryId: 9,
name: '衣物洗护', goodsCategoryName: '衣物洗护',
children: [{ child: [{
pId: 9, pId: 9,
id: 10, goodsCategoryId: 10,
name: '丝绸服装', goodsCategoryName: '丝绸服装',
children: [{ child: [{
id: 11, goodsCategoryId: 11,
name: '单件清洗' goodsCategoryName: '单件清洗'
}, { }, {
id: 12, goodsCategoryId: 12,
name: '套餐清洗' goodsCategoryName: '套餐清洗'
}] }]
}, { }, {
pId: 9, pId: 9,
id: 14, goodsCategoryId: 14,
name: '呢绒服装', goodsCategoryName: '呢绒服装',
children: [{ child: [{
id: 15, goodsCategoryId: 15,
name: '单件清洗' goodsCategoryName: '单件清洗'
}] }]
}] }]
}, { }, {
id: 16, goodsCategoryId: 16,
name: 'Tab3', goodsCategoryName: 'Tab3',
children: [{ child: [{
id: 17, goodsCategoryId: 17,
name: 'Tab3-0', goodsCategoryName: 'Tab3-0',
children: [{ child: [{
id: 18, goodsCategoryId: 18,
name: 'Tab3-0-0' goodsCategoryName: 'Tab3-0-0'
}, { }, {
id: 19, goodsCategoryId: 19,
name: 'Tab3-0-1' goodsCategoryName: 'Tab3-0-1'
}] }]
}] }]
}, { }, {
id: 20, goodsCategoryId: 20,
name: 'Tab4', goodsCategoryName: 'Tab4',
children: [{ child: [{
id: 21, goodsCategoryId: 21,
name: 'Tab4-0', goodsCategoryName: 'Tab4-0',
children: [{ child: [{
id: 22, goodsCategoryId: 22,
name: 'Tab4-0-0' goodsCategoryName: 'Tab4-0-0'
}, { }, {
id: 23, goodsCategoryId: 23,
name: 'Tab4-0-1' goodsCategoryName: 'Tab4-0-1'
}] }]
}] }]
}] }]

4
common/js/request.js
View File

@ -10,9 +10,9 @@ export default {
title: '加载中' title: '加载中'
}) })
// request 触发前拼接 url // request 触发前拼接 url
// args.url = 'https://www.opsoul.com' + args.url; args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url; // args.url = 'http://192.168.2.42:80' + args.url;
args.url = 'http://127.0.0.1:80' + args.url; // args.url = 'http://127.0.0.1:80' + args.url;
if (args.data) { if (args.data) {
args.data.deptId = globalData.deptId; args.data.deptId = globalData.deptId;
args.data.from = globalData.from; args.data.from = globalData.from;

2
components/default-toast/bg-toast.vue
View File

@ -2,7 +2,7 @@
<view> <view>
<view class="padding-xl text-gray text-center"> <view class="padding-xl text-gray text-center">
<view class="big-icon padding-tb" :class="'cuIcon-' + icon"></view> <view class="big-icon padding-tb" :class="'cuIcon-' + icon"></view>
<view class="text-lg">开发中，敬请期待</view> <view class="text-lg">功能开发中，暂无法使用</view>
</view> </view>
</view> </view>
</template> </template>

57
pages/index/home.vue
View File

@ -33,13 +33,11 @@
<text class="cuIcon-apps text-main-color"></text> <text class="cuIcon-apps text-main-color"></text>
<text class="cuIcon-triangledownfill"></text> <text class="cuIcon-triangledownfill"></text>
</view> </view>
<view> <view class="flex-twice">
<scroll-view scroll-x class="nav"> <scroll-view scroll-x class="nav text-right" :scroll-with-animation="true" :scroll-left="scrollLeft">
<view class="flex text-center"> <view class="cu-item" :class="index==tabCur?'text-main-color cur':''"
<view class="cu-item flex-sub" :class="index==tabCur?'text-main-color cur':''" v-for="(item,index) in categories" :key="item.goodsCategoryId" @tap="tabSelect($event, item)" :data-index="index">
v-for="(item,index) in categories" :key="item.id" @tap="tabSelect" :data-id="index"> {{item.goodsCategoryName}}
{{item.name}}
</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
@ -53,7 +51,7 @@
<block v-if="item.badge!=1">{{item.badge}}</block> <block v-if="item.badge!=1">{{item.badge}}</block>
</view> </view>
</view> </view>
<text>{{item.name}}</text> <text>{{item.goodsCategoryName}}</text>
</view> </view>
</view> </view>
<!-- 细类 --> <!-- 细类 -->
@ -65,7 +63,7 @@
<block v-if="item.badge!=1">{{item.badge}}</block> <block v-if="item.badge!=1">{{item.badge}}</block>
</view> </view>
</view> </view>
<text>{{item.name}}</text> <text>{{item.goodsCategoryName}}</text>
</view> </view>
</view> </view>
<!-- 超值服务 --> <!-- 超值服务 -->
@ -118,7 +116,8 @@
verticalGoodsCard verticalGoodsCard
}, },
data() { data() {
return { return {
scrollLeft: 0,
dotStyle: true, dotStyle: true,
swiperList: [], swiperList: [],
tabCur: 0, tabCur: 0,
@ -170,11 +169,13 @@
pageNum: 0, pageNum: 0,
pageSize: 50 pageSize: 50
}); });
this.hotGoods = hotGoodsRes.rows; this.hotGoods = hotGoodsRes.rows;
// 加载品类
this.loadCategoryList();
this.swiperList = await this.$api.data('swiperList'); this.swiperList = await this.$api.data('swiperList');
this.categories = await this.$api.data('categories'); // this.categories = await this.$api.data('categories');
this.subCategories = await this.$api.data('subCategories'); // this.subCategories = await this.$api.data('subCategories');
this.moduleBarInfos = await this.$api.data('moduleBarInfos'); this.moduleBarInfos = await this.$api.data('moduleBarInfos');
// this.hotGoods = await this.$api.data('hotGoods'); // this.hotGoods = await this.$api.data('hotGoods');
// this.discountGoods = await this.$api.data('discountGoods'); // this.discountGoods = await this.$api.data('discountGoods');
@ -184,6 +185,16 @@
}, },
offBindEvent() { offBindEvent() {
uni.$off('index_showProductDetail'); uni.$off('index_showProductDetail');
},
async loadCategoryList() {
let typeList = await this.$request.listByStep();
typeList = typeList.data;
let subTypeList = await this.$request.listByStep({
goodsCategoryId: typeList[0].goodsCategoryId
});
subTypeList = subTypeList.data;
this.categories = subTypeList;
this.tabSelect(null, this.categories[0]);
}, },
async loadRegionList() { async loadRegionList() {
let regionList = await this.$request.areaListByStep(); let regionList = await this.$request.areaListByStep();
@ -247,13 +258,19 @@
this.areaMultiIndex = [this.areaMultiIndex[0], colObj.value, 0]; this.areaMultiIndex = [this.areaMultiIndex[0], colObj.value, 0];
} }
}, },
async tabSelect(e) { async tabSelect(e, item) {
this.tabCur = e.currentTarget.dataset.id; this.tabCur = e == null ? 0 : e.currentTarget.dataset.index;
// 获取大类信息 this.scrollLeft = (this.tabCur - 1) * 60;
let categoryId = this.categories[this.tabCur].id; let subSubTypeList = await this.$request.listByStep({
console.log("切换细类, 大类id=" + categoryId); goodsCategoryId: item.goodsCategoryId
let allSubCategories = await this.$api.data('subCategories'); });
this.subCategories = allSubCategories.slice(0, (4 - categoryId) * 5); subSubTypeList = subSubTypeList.data;
let subCategoryOpt = await this.$api.data('subCategories');
for(let i = 0; i < subSubTypeList.length; i++) {
subSubTypeList[i]['cuIcon'] = subCategoryOpt[i].cuIcon;
subSubTypeList[i]['color'] = subCategoryOpt[i].color;
}
this.subCategories = subSubTypeList;
}, },
chooseCategory(item) { chooseCategory(item) {
this.searchInfo.category = item; this.searchInfo.category = item;

12
pages/index/my-home.vue
View File

@ -46,7 +46,7 @@
</view> </view>
</view> </view>
<view class="padding-top serv-news"> <view class="padding-top serv-news">
<view class="flex justify-between padding-bottom" v-for="(item, index) in myInfo.servCircle.news"> <view class="flex justify-between padding-bottom" v-for="(item, index) in myInfo.servCircle.newBuy">
<view class="flex justify-start"> <view class="flex justify-start">
<view class="cu-avatar round margin-right-sm" <view class="cu-avatar round margin-right-sm"
:style="'background-image:url(' + item.avatarUrl + ');'"></view> :style="'background-image:url(' + item.avatarUrl + ');'"></view>
@ -287,19 +287,19 @@
}], }],
servOrderType: 0, servOrderType: 0,
productOrderTabList: [{ productOrderTabList: [{
type: 'pdOrdersWait2Pay', // type: -1,
name: '待付款' name: '待付款'
}, { }, {
type: 'pdOrdersBought', type: -1,
name: '买到的' name: '买到的'
}, { }, {
type: 'pdOrdersSaled', type: -1,
name: '卖出的' name: '卖出的'
}, { }, {
type: 'pdOrdersAfterServ', type: -1,
name: '售后中' name: '售后中'
}, { }, {
type: 'pdOrdersFinish', type: -1,
name: '已完成' name: '已完成'
}], }],
productOrderType: 1 productOrderType: 1

8
pages/my/my-cart.vue
View File

@ -79,7 +79,7 @@
}, },
methods: { methods: {
async loadData() { async loadData() {
this.pickedProductList = await this.$api.data('pickedProductList'); // this.pickedProductList = await this.$api.data('pickedProductList');
}, },
bindEvent() { bindEvent() {
uni.$on('changePickedNum', this.changePickedNum); uni.$on('changePickedNum', this.changePickedNum);
@ -140,9 +140,9 @@
this.allChecked = !this.allChecked; this.allChecked = !this.allChecked;
}, },
submit() { submit() {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/order/order-detail' // url: '/pages/order/order-detail'
}) // })
} }
} }
} }

12
pages/order/order-detail.vue
View File

@ -64,7 +64,7 @@
<view class="cu-bar"> <view class="cu-bar">
<view class="action bar-first-action"> <view class="action bar-first-action">
<text class="cuIcon-shopfill text-main-color"></text> <text class="cuIcon-shopfill text-main-color"></text>
{{item.shopName}} {{item.name}}
<view> <view>
<view class="cuIcon-right"></view> <view class="cuIcon-right"></view>
</view> </view>
@ -176,12 +176,18 @@
this.offBindEvent(); this.offBindEvent();
}, },
methods: { methods: {
async loadData(params) { async loadData(params) {
console.log(params)
// this.pickedProductList = await this.$api.data('pickedProductList'); // this.pickedProductList = await this.$api.data('pickedProductList');
this.pickedProductList = params.pickedProductList; this.pickedProductList = params.pickedProductList;
this.loadTotalPrice();
this.timeRangeList = this.$globalData.timeRangeList; this.timeRangeList = this.$globalData.timeRangeList;
this.timeRange = this.timeRangeList[0]; this.timeRange = this.timeRangeList[0];
},
loadTotalPrice() {
// 计算totalprice
this.pickedProductList.forEach((obj) => {
this.totalPrice += Number(obj.totalMoney)
})
}, },
bindEvent() { bindEvent() {
uni.$on(this.$globalFun.CHOOSE_ADDRESS, this.chooseAddress); uni.$on(this.$globalFun.CHOOSE_ADDRESS, this.chooseAddress);

6
pages/order/pay-result.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view> <view>
<!-- 顶部操作条 --> <!-- 顶部操作条 -->
<cu-custom :bgColor="'bg-main-color'" :isBack="true"> <cu-custom :bgColor="'bg-main-color'" :isBack="true" :isBackHome="true" :homePageUrl="'/pages/index/index'">
<block slot="backText">返回</block> <!-- <block slot="backText">返回</block>
<block slot="content">支付结果</block> <block slot="content">支付结果</block> -->
</cu-custom> </cu-custom>
<view class="padding-lg margin-xl text-center"> <view class="padding-lg margin-xl text-center">
<view class="text-xxl" v-if="customTip">{{customTip}}</view> <view class="text-xxl" v-if="customTip">{{customTip}}</view>

10
pages/product/product-detail.vue
View File

@ -38,21 +38,21 @@
<text class="text-sl text-price">{{curProductSpecs.goodsPrice}}</text> <text class="text-sl text-price">{{curProductSpecs.goodsPrice}}</text>
</view> </view>
<view> <view>
<text class="text-df">已售：{{curProductSpecs.saledCount}}</text> <!-- <text class="text-df">已售：{{curProductSpecs.saledCount}}</text> -->
</view> </view>
</view> </view>
<view id="pageAnchor0" class="flex justify-between align-end"> <view id="pageAnchor0" class="flex justify-between align-end">
<view class="text-df"> <view class="text-df">
佣金：<text class="text-price margin-right-sm">{{curProductSpecs.groupPrice}}</text> <!-- 佣金：<text class="text-price margin-right-sm">{{curProductSpecs.groupPrice}}</text> -->
<!-- <text class="cuIcon-share"></text> --> <!-- <text class="cuIcon-share"></text> -->
</view> </view>
<!-- <view class="text-df"> <!-- <view class="text-df">
距结束：<uni-countdown style="float: right;" :day="1" :hour="1" :minute="12" :second="40" background-color="#fff" splitorColor="#fff"></uni-countdown> 距结束：<uni-countdown style="float: right;" :day="1" :hour="1" :minute="12" :second="40" background-color="#fff" splitorColor="#fff"></uni-countdown>
</view> --> </view> -->
<view class="flex justify-end text-df align-center"> <view class="flex justify-end text-df align-center">
<view>距结束：</view> <!-- <view>距结束：</view> -->
<uni-countdown style="float: right;" :day="1" :hour="1" :minute="12" :second="40" <!-- <uni-countdown style="float: right;" :day="1" :hour="1" :minute="12" :second="40"
background-color="#fff" splitorColor="#fff"></uni-countdown> background-color="#fff" splitorColor="#fff"></uni-countdown> -->
</view> </view>
</view> </view>
</view> </view>

3
pages/product/product-pick.vue
View File

@ -128,7 +128,8 @@
} }
let params = { let params = {
pickedProductList: [{ pickedProductList: [{
...this.shopInfo, ...this.shopInfo,
totalMoney: this.totalPrice,
product: [{ product: [{
...this.productInfo, ...this.productInfo,
discountPrice: this.specsList[0].discountPrice, discountPrice: this.specsList[0].discountPrice,

3
pages/product/shop-detail.vue
View File

@ -236,7 +236,8 @@
searchGoods() { searchGoods() {
let params = { let params = {
areaId: this.searchInfo.area[2].areaId, areaId: this.searchInfo.area[2].areaId,
goodsName: this.searchInfo.goodsName goodsName: this.searchInfo.goodsName,
workerId: this.shopInfo.workerId
}; };
this.loadProductData(params); this.loadProductData(params);
}, },

6
pages/publish/publish-task.vue
View File

@ -232,7 +232,11 @@
async loadData() { async loadData() {
this.categoryList = await this.$api.data('categoryList'); this.categoryList = await this.$api.data('categoryList');
this.areaList = await this.$api.data('areaList'); this.areaList = await this.$api.data('areaList');
this.defaultAddress = await this.$api.data('defaultAddress'); this.defaultAddress = await this.$api.data('defaultAddress');
uni.showToast({
title: '功能开发中，暂无法使用',
icon: 'none'
})
}, },
nextStep() { nextStep() {
this.curStep = this.curStep === this.stepList.length - 1 ? this.curStep : ++this.curStep this.curStep = this.curStep === this.stepList.length - 1 ? this.curStep : ++this.curStep